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

Unified Diff: pkg/compiler/lib/src/ssa/builder.dart

Issue 1149403009: Refactoring resolution of local access and unqualified access of statics (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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/ssa/builder.dart
diff --git a/pkg/compiler/lib/src/ssa/builder.dart b/pkg/compiler/lib/src/ssa/builder.dart
index 98b0fca06a91d66f9ba1160ca9a816e281cc19bf..2b62bba80c52e99e02beb907a31b8e1cf7f3ff3d 100644
--- a/pkg/compiler/lib/src/ssa/builder.dart
+++ b/pkg/compiler/lib/src/ssa/builder.dart
@@ -1322,9 +1322,12 @@ class SsaBuilder extends NewResolvedVisitor {
bool meetsHardConstraints() {
if (compiler.disableInlining) return false;
- assert(selector != null
- || Elements.isStaticOrTopLevel(element)
- || element.isGenerativeConstructorBody);
+ assert(invariant(
+ currentNode != null ? currentNode : element,
+ selector != null ||
+ Elements.isStaticOrTopLevel(element) ||
+ element.isGenerativeConstructorBody,
+ message: "Missing selector for inlining of $element."));
if (selector != null && !selector.applies(function, compiler.world)) {
return false;
}
@@ -3246,8 +3249,7 @@ class SsaBuilder extends NewResolvedVisitor {
return pop();
}
- String noSuchMethodTargetSymbolString(ErroneousElement error,
- [String prefix]) {
+ String noSuchMethodTargetSymbolString(Element error, [String prefix]) {
String result = error.name;
if (prefix == "set") return "$result=";
return result;
@@ -3288,14 +3290,18 @@ class SsaBuilder extends NewResolvedVisitor {
node);
}
+ void handleInvalidStaticGet(ast.Send node, Element element) {
+ generateThrowNoSuchMethod(
+ node,
+ noSuchMethodTargetSymbolString(element, 'get'),
+ argumentNodes: const Link<ast.Node>());
+ }
+
/// Generate read access of an unresolved static or top level entity.
void generateStaticUnresolvedGet(ast.Send node, Element element) {
if (element is ErroneousElement) {
// An erroneous element indicates an unresolved static getter.
- generateThrowNoSuchMethod(
- node,
- noSuchMethodTargetSymbolString(element, 'get'),
- argumentNodes: const Link<ast.Node>());
+ handleInvalidStaticGet(node, element);
} else {
// This happens when [element] has parse errors.
assert(invariant(node, element == null || element.isErroneous));
@@ -5142,6 +5148,22 @@ class SsaBuilder extends NewResolvedVisitor {
}
@override
+ void visitTopLevelSetterGet(
+ ast.Send node,
+ MethodElement setter,
+ _) {
+ handleInvalidStaticGet(node, setter);
+ }
+
+ @override
+ void visitStaticSetterGet(
+ ast.Send node,
+ MethodElement setter,
+ _) {
+ handleInvalidStaticGet(node, setter);
+ }
+
+ @override
void visitUnresolvedGet(
ast.Send node,
Element element,
@@ -5149,6 +5171,32 @@ class SsaBuilder extends NewResolvedVisitor {
generateStaticUnresolvedGet(node, element);
}
+ void handleInvalidStaticInvoke(ast.Send node, Element element) {
+ generateThrowNoSuchMethod(node,
+ noSuchMethodTargetSymbolString(element),
+ argumentNodes: node.arguments);
+ }
+
+ @override
+ void visitStaticSetterInvoke(
+ ast.Send node,
+ MethodElement setter,
+ ast.NodeList arguments,
+ CallStructure callStructure,
+ _) {
+ handleInvalidStaticInvoke(node, setter);
+ }
+
+ @override
+ void visitTopLevelSetterInvoke(
+ ast.Send node,
+ MethodElement setter,
+ ast.NodeList arguments,
+ CallStructure callStructure,
+ _) {
+ handleInvalidStaticInvoke(node, setter);
+ }
+
@override
void visitUnresolvedInvoke(
ast.Send node,
@@ -5159,9 +5207,7 @@ class SsaBuilder extends NewResolvedVisitor {
if (element is ErroneousElement) {
// An erroneous element indicates that the funciton could not be
// resolved (a warning has been issued).
- generateThrowNoSuchMethod(node,
- noSuchMethodTargetSymbolString(element),
- argumentNodes: node.arguments);
+ handleInvalidStaticInvoke(node, element);
} else {
// TODO(ahe): Do something like [generateWrongArgumentCountError].
stack.add(graph.addConstantNull(compiler));

Powered by Google App Engine
This is Rietveld 408576698