Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(734)

Unified Diff: pkg/compiler/lib/src/resolution/members.dart

Issue 1311123002: Revert "Remove SendResolver.computeSendStructure." (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/resolution/members.dart
diff --git a/pkg/compiler/lib/src/resolution/members.dart b/pkg/compiler/lib/src/resolution/members.dart
index d89474404cc791185bef9ad3c99fcc2363bef8db..24ea86acaaee2387d9165f6bf96055235f8f4d12 100644
--- a/pkg/compiler/lib/src/resolution/members.dart
+++ b/pkg/compiler/lib/src/resolution/members.dart
@@ -790,18 +790,13 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
return null;
}
- /// Check that access to `this` is currently allowed. Returns an
- /// [AccessSemantics] in case of an error, `null` otherwise.
- AccessSemantics checkThisAccess(Send node) {
+ /// Check that access to `this` is currently allowed.
+ bool checkThisAccess(Send node) {
if (!inInstanceContext) {
- ErroneousElement error = reportAndCreateErroneousElement(
- node,
- 'this',
- MessageKind.NO_THIS_AVAILABLE,
- const {});
- return new StaticAccess.invalid(error);
+ compiler.reportError(node, MessageKind.NO_THIS_AVAILABLE);
+ return false;
}
- return null;
+ return true;
}
/// Compute the [AccessSemantics] corresponding to a super access of [target].
@@ -1569,24 +1564,22 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
/// Handle access on `this`, like `this()` and `this` when it is parsed as a
/// [Send] node.
ResolutionResult handleThisAccess(Send node) {
+ AccessSemantics accessSemantics = const DynamicAccess.thisAccess();
if (node.isCall) {
CallStructure callStructure =
resolveArguments(node.argumentsNode).callStructure;
Selector selector = callStructure.callSelector;
// TODO(johnniwinther): Handle invalid this access as an
// [AccessSemantics].
- AccessSemantics accessSemantics = checkThisAccess(node);
- if (accessSemantics == null) {
- accessSemantics = const DynamicAccess.thisAccess();
+ if (checkThisAccess(node)) {
registry.registerDynamicInvocation(
new UniverseSelector(selector, null));
+ registry.registerSendStructure(node,
+ new InvokeStructure(accessSemantics, selector));
}
- registry.registerSendStructure(node,
- new InvokeStructure(accessSemantics, selector));
// TODO(23998): Remove this when all information goes through
// the [SendStructure].
registry.setSelector(node, selector);
- return const NoneResult();
} else {
// TODO(johnniwinther): Handle get of `this` when it is a [Send] node.
internalError(node, "Unexpected node '$node'.");
@@ -2416,14 +2409,12 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
} else if (node.isSuperCall) {
return handleSuperPropertyAccess(node, name);
} else if (node.receiver.isThis()) {
- AccessSemantics semantics = checkThisAccess(node);
- if (semantics == null) {
+ if (checkThisAccess(node)) {
return handleThisPropertyAccess(node, name);
- } else {
- // TODO(johnniwinther): Handle invalid this access as an
- // [AccessSemantics].
- return handleErroneousAccess(node, name, semantics);
}
+ // TODO(johnniwinther): Handle invalid this access as an
+ // [AccessSemantics].
+ return const NoneResult();
}
ResolutionResult result = visitExpressionPrefix(node.receiver);
if (result.kind == ResultKind.PREFIX) {
@@ -2449,14 +2440,12 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
if (text == 'this') {
return handleQualifiedThisAccess(node, name);
} else if (node.receiver.isThis()) {
- AccessSemantics semantics = checkThisAccess(node);
- if (semantics == null) {
+ if (checkThisAccess(node)) {
return handleThisPropertyUpdate(node, name, null);
- } else {
- // TODO(johnniwinther): Handle invalid this access as an
- // [AccessSemantics].
- return handleUpdate(node, name, semantics);
}
+ // TODO(johnniwinther): Handle invalid this access as an
+ // [AccessSemantics].
+ return const NoneResult();
}
ResolutionResult result = visitExpressionPrefix(node.receiver);
if (result.kind == ResultKind.PREFIX) {
« no previous file with comments | « pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart ('k') | pkg/compiler/lib/src/resolution/semantic_visitor.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698