Fix issue 2358: dart methods on native classes must also check if the current prototype has the met…

lib/compiler/implementation/native_emitter.dart

 // Copyright (c) 2012, 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.
 
 class NativeEmitter {
 
   Compiler compiler;
   StringBuffer buffer;
 
   // Classes that participate in dynamic dispatch. These are the
@@ skipping 142 matching lines @@
     // must be turned into a JS call to:
     //   foo(null, y).
 
     List<String> nativeArgumentsBuffer = argumentsBuffer.getRange(
         0, indexOfLastOptionalArgumentInParameters + 1);
 
     ClassElement classElement = member.enclosingElement;
     String nativeName = classElement.nativeName.slowToString();
     String nativeArguments = Strings.join(nativeArgumentsBuffer, ",");
 
+    String name = member.name.slowToString();
+    String code = '  return this.$name($nativeArguments);\n';
     if (isNativeLiteral(nativeName) || !overriddenMethods.contains(member)) {
       // Call the method directly.
-      buffer.add('    return this.${member.name.slowToString()}');
-      buffer.add('($nativeArguments)');
-      return;
+      buffer.add(code);
+    } else {
+      native.generateMethodWithPrototypeCheck(
+          compiler, buffer, invocationName, code, stubParameters);
     }
-
-    // If the method is overridden, we must check if the prototype of
-    // 'this' has the method available. Otherwise, we may end up
-    // calling the method from the super class. If the method is not
-    // available, we make a direct call to
-    // Object.prototype.$invocationName. This method will patch the
-    // prototype of 'this' to the real method.
-
-    buffer.add('  if (Object.getPrototypeOf(this).hasOwnProperty(');
-    buffer.add("'$invocationName')) {\n");
-    buffer.add('    return this.${member.name.slowToString()}');
-    buffer.add('($nativeArguments)');
-    buffer.add('\n  }\n');
-    buffer.add('  return Object.prototype.$invocationName.call(this');
-    buffer.add(stubParameters == '' ? '' : ', $stubParameters');
-    buffer.add(');');
   }
 
   void emitDynamicDispatchMetadata() {
     if (classesWithDynamicDispatch.isEmpty()) return;
     buffer.add('// ${classesWithDynamicDispatch.length} dynamic classes.\n');
 
     // Build a pre-order traversal over all the classes and their subclasses.
     Set<ClassElement> seen = new Set<ClassElement>();
     List<ClassElement> classes = <ClassElement>[];
     void visit(ClassElement cls) {
@@ skipping 152 matching lines @@
     String toStringName = compiler.namer.instanceMethodName(
         null, const SourceString('toString'), 0);
     objectProperties.add("$defPropName(Object.prototype, '$toStringName', ");
     objectProperties.add(
         'function() { return $toStringHelperName(this); });\n');
 
     // Finally, emit the code in the main buffer.
     targetBuffer.add('(function() {\n$objectProperties$buffer\n})();\n');
   }
 }