Don't bailout of type inference for simple NSM implementations

pkg/compiler/lib/src/js_backend/no_such_method_registry.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of js_backend;
 
 /**
  * Categorizes `noSuchMethod` implementations.
  *
  * If user code includes `noSuchMethod` implementations, type inference is
@@ skipping 27 matching lines @@
  */
 class NoSuchMethodRegistry {
   /// The implementations that fall into category A, described above.
   final Set<FunctionElement> defaultImpls = new Set<FunctionElement>();
   /// The implementations that fall into category B, described above.
   final Set<FunctionElement> throwingImpls = new Set<FunctionElement>();
   /// The implementations that fall into category C, described above.
   final Set<Element> otherImpls = new Set<Element>();
 
   /// The implementations that have not yet been categorized.
-  final Set<Element> uncategorizedImpls = new Set<Element>();
+  final Set<Element> _uncategorizedImpls = new Set<Element>();
 
-  final JavaScriptBackend backend;
-  final Compiler compiler;
+  final JavaScriptBackend _backend;
+  final Compiler _compiler;
 
   NoSuchMethodRegistry(JavaScriptBackend backend)
-      : this.backend = backend,
-        this.compiler = backend.compiler;
+      : this._backend = backend,
+        this._compiler = backend.compiler;
 
   bool get hasThrowingNoSuchMethod => throwingImpls.isNotEmpty;
   bool get hasComplexNoSuchMethod => otherImpls.isNotEmpty;
 
   void registerNoSuchMethod(Element noSuchMethodElement) {
-    uncategorizedImpls.add(noSuchMethodElement);
+    _uncategorizedImpls.add(noSuchMethodElement);
   }
 
   void onQueueEmpty() {
-    uncategorizedImpls.forEach(_categorizeImpl);
-    uncategorizedImpls.clear();
+    _uncategorizedImpls.forEach(_categorizeImpl);
+    _uncategorizedImpls.clear();
   }
 
+  bool isComplex(FunctionElement element) => otherImpls.contains(element);

[floitsch, 2015/03/23 22:34:42]

Add dartdoc.
assert, that the element is a nsm.

[Harry Terkelsen, 2015/03/24 00:10:29]

Done.

+
   NsmCategory _categorizeImpl(Element noSuchMethodElement) {
     assert(noSuchMethodElement.name == Compiler.NO_SUCH_METHOD);
     if (defaultImpls.contains(noSuchMethodElement)) {
       return NsmCategory.DEFAULT;
     }
     if (throwingImpls.contains(noSuchMethodElement)) {
       return NsmCategory.THROWING;
     }
     if (otherImpls.contains(noSuchMethodElement)) {
       return NsmCategory.OTHER;
     }
     if (noSuchMethodElement is! FunctionElement ||
-        !compiler.noSuchMethodSelector.signatureApplies(noSuchMethodElement)) {
+        !_compiler.noSuchMethodSelector.signatureApplies(noSuchMethodElement)) {
       otherImpls.add(noSuchMethodElement);
       return NsmCategory.OTHER;
     }
     FunctionElement noSuchMethodFunc = noSuchMethodElement as FunctionElement;
-    if (backend.isDefaultNoSuchMethodImplementation(noSuchMethodFunc)) {
+    if (_isDefaultNoSuchMethodImplementation(noSuchMethodFunc)) {
       defaultImpls.add(noSuchMethodFunc);
       return NsmCategory.DEFAULT;
-    } else if (hasForwardingSyntax(noSuchMethodFunc)) {
+    } else if (_hasForwardingSyntax(noSuchMethodFunc)) {
       // If the implementation is 'noSuchMethod(x) => super.noSuchMethod(x);'
       // then it is in the same category as the super call.
       Element superCall = noSuchMethodFunc.enclosingClass
-          .lookupSuperSelector(compiler.noSuchMethodSelector);
+          .lookupSuperSelector(_compiler.noSuchMethodSelector);
       NsmCategory category = _categorizeImpl(superCall);
       switch(category) {
         case NsmCategory.DEFAULT:
           defaultImpls.add(noSuchMethodFunc);
           break;
         case NsmCategory.THROWING:
           throwingImpls.add(noSuchMethodFunc);
           break;
         case NsmCategory.OTHER:
           otherImpls.add(noSuchMethodFunc);
           break;
       }
       return category;
-    } else if (isThrowing(noSuchMethodFunc)) {
+    } else if (_hasThrowingSyntax(noSuchMethodFunc)) {
       throwingImpls.add(noSuchMethodFunc);
       return NsmCategory.THROWING;
     } else {
       otherImpls.add(noSuchMethodFunc);
       return NsmCategory.OTHER;
     }
   }
 
-  bool hasForwardingSyntax(FunctionElement element) {
+  bool _isDefaultNoSuchMethodImplementation(Element element) {
+    ClassElement classElement = element.enclosingClass;
+    return classElement == _compiler.objectClass
+        || classElement == _backend.jsInterceptorClass
+        || classElement == _backend.jsNullClass;
+  }
+
+  bool _hasForwardingSyntax(FunctionElement element) {
     // At this point we know that this is signature-compatible with
     // Object.noSuchMethod, but it may have more than one argument as long as
     // it only has one required argument.
     String param = element.parameters.first.name;
     Statement body = element.node.body;
     Expression expr;
     if (body is Return && body.isArrowBody) {
       expr = body.expression;
     } else if (body is Block &&
         !body.statements.isEmpty &&
@@ skipping 13 matching lines @@
           arg.argumentsNode == null &&
           arg.receiver == null &&
           arg.selector is Identifier &&
           arg.selector.source == param) {
         return true;
       }
     }
     return false;
   }
 
-  bool isThrowing(FunctionElement element) {
+  bool _hasThrowingSyntax(FunctionElement element) {
     Statement body = element.node.body;
     if (body is Return && body.isArrowBody) {
       if (body.expression is Throw) {
         return true;
       }
     } else if (body is Block &&
         !body.statements.isEmpty &&
         body.statements.nodes.tail.isEmpty) {
       if (body.statements.nodes.head is Throw) {
         return true;
       }
     }
     return false;
   }
 }
 
 enum NsmCategory { DEFAULT, THROWING, OTHER }