Fix for issue 2433: for stubs on native classes, only call a method with a non-mangled name when th…

dart/lib/compiler/implementation/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.
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
 class ClosureInvocationElement extends FunctionElement {
   ClosureInvocationElement(SourceString name,
@@ skipping 44 matching lines @@
     if (addedInheritFunction) return;
     addedInheritFunction = true;
     mainBuffer.add('$inheritsName = ');
     mainBuffer.add(INHERIT_FUNCTION);
     mainBuffer.add(';\n');
   }
 
   void addParameterStub(FunctionElement member,
                         String attachTo(String invocationName),
                         StringBuffer buffer,
-                        Selector selector,
-                        bool isNative) {
+                        Selector selector) {
     FunctionParameters parameters = member.computeParameters(compiler);
     int positionalArgumentCount = selector.positionalArgumentCount;
     if (positionalArgumentCount == parameters.parameterCount) {
       assert(selector.namedArgumentCount == 0);
       return;
     }
     ConstantHandler handler = compiler.constantHandler;
     List<SourceString> names = selector.getOrderedNamedArguments();
 
     String invocationName =
@@ skipping 69 matching lines @@
             handler.writeConstant(argumentBuffer, value);
             argumentsBuffer[count] = argumentBuffer.toString();
           }
         }
       }
       count++;
     });
     String parametersString = Strings.join(parametersBuffer, ",");
     buffer.add('$parametersString) {\n');
 
-    if (isNative) {
+    if (member.isNative()) {
       nativeEmitter.emitParameterStub(
           member, invocationName, parametersString, argumentsBuffer,
           indexOfLastOptionalArgumentInParameters);
     } else {
       String arguments = Strings.join(argumentsBuffer, ",");
       buffer.add('  return this.${namer.getName(member)}($arguments)');
   }
     buffer.add('\n};\n');
   }
 
   void addParameterStubs(FunctionElement member,
                          String attachTo(String invocationName),
-                         StringBuffer buffer,
-                         [bool isNative = false]) {
+                         StringBuffer buffer) {
     Set<Selector> selectors = compiler.universe.invokedNames[member.name];
     if (selectors == null) return;
     FunctionParameters parameters = member.computeParameters(compiler);
     for (Selector selector in selectors) {
       if (!selector.applies(parameters)) continue;
-      addParameterStub(member, attachTo, buffer, selector, isNative);
+      addParameterStub(member, attachTo, buffer, selector);
     }
   }
 
   void addInstanceMember(Element member,
                          String attachTo(String name),
-                         StringBuffer buffer,
-                         [bool isNative = false]) {
+                         StringBuffer buffer) {
     // TODO(floitsch): we don't need to deal with members of
     // uninstantiated classes, that have been overwritten by subclasses.
 
     if (member.kind === ElementKind.FUNCTION
         || member.kind === ElementKind.GENERATIVE_CONSTRUCTOR_BODY
         || member.kind === ElementKind.GETTER
         || member.kind === ElementKind.SETTER) {
       if (member.modifiers !== null && member.modifiers.isAbstract()) return;
       String codeBlock = compiler.universe.generatedCode[member];
       if (codeBlock == null) return;
       buffer.add('${attachTo(namer.getName(member))} = $codeBlock;\n');
       codeBlock = compiler.universe.generatedBailoutCode[member];
       if (codeBlock !== null) {
         String name = compiler.namer.getBailoutName(member);
         buffer.add('${attachTo(name)} = $codeBlock;\n');
       }
       FunctionElement function = member;
       FunctionParameters parameters = function.computeParameters(compiler);
       if (!parameters.optionalParameters.isEmpty()) {
-        addParameterStubs(member, attachTo, buffer, isNative: isNative);
+        addParameterStubs(member, attachTo, buffer);
       }
     } else if (member.kind === ElementKind.FIELD) {
       // TODO(ngeoffray): Have another class generate the code for the
       // fields.
       if ((member.modifiers === null || !member.modifiers.isFinal()) &&
           compiler.universe.invokedSetters.contains(member.name)) {
         String setterName = namer.setterName(member.getLibrary(), member.name);
-        String name =
-            isNative ? member.name.slowToString() : namer.getName(member);
+        String name = member.isNative()
+            ? member.name.slowToString()
+            : namer.getName(member);
         buffer.add('${attachTo(setterName)} = function(v){\n');
         buffer.add('  this.$name = v;\n};\n');
       }
       if (compiler.universe.invokedGetters.contains(member.name)) {
         String getterName = namer.getterName(member.getLibrary(), member.name);
-        String name =
-            isNative ? member.name.slowToString() : namer.getName(member);
+        String name = member.isNative()
+            ? member.name.slowToString()
+            : namer.getName(member);
         buffer.add('${attachTo(getterName)} = function(){\n');
         buffer.add('  return this.$name;\n};\n');
       }
     } else {
       compiler.internalError('unexpected kind: "${member.kind}"',
                              element: member);
     }
     emitExtraAccessors(member, attachTo, buffer);
   }
 
@@ skipping 505 matching lines @@
       mainBuffer.add(
           'var ${namer.CURRENT_ISOLATE} = new ${namer.ISOLATE}();\n');
       nativeEmitter.emitDynamicDispatchMetadata();
       nativeEmitter.assembleCode(mainBuffer);
       emitMain(mainBuffer);
       compiler.assembledCode = mainBuffer.toString();
     });
     return compiler.assembledCode;
   }
 }