fix arguments keyword used in our helper method

John Messerly · John Messerly · commit f0e35ab12c91 · 2015-03-30T10:46:13.000-07:00
R=jacobr@google.com Review URL: https://codereview.chromium.org/1048873002
diff --git a/pkg/dev_compiler/lib/runtime/dart/core.js b/pkg/dev_compiler/lib/runtime/dart/core.js
@@ -7,7 +7,7 @@ var core;
       var init = this[name];
       var result = void 0;
       if (init)
-        result = init.apply(this, arguments$);
+        result = init.apply(this, arguments);
       return result === void 0 ? this : result;
     }
     ['=='](other) {
diff --git a/pkg/dev_compiler/lib/src/codegen/js_codegen.dart b/pkg/dev_compiler/lib/src/codegen/js_codegen.dart
@@ -616,15 +616,17 @@ class JSCodegenVisitor extends GeneralizingAstVisitor with ConversionVisitor {
       // settles. See <https://github.com/dart-lang/dev_compiler/issues/51>.
       // Performance of this pattern is likely to be bad.
       name = 'constructor';
+      // Mark the parameter as no-rename.
+      var args = new JS.Identifier('arguments', allowRename: false);
       body = js.statement('''{
         // Get the class name for this instance.
         var name = this.constructor.name;
         // Call the default constructor.
         var init = this[name];
         var result = void 0;
-        if (init) result = init.apply(this, arguments);
+        if (init) result = init.apply(this, #);
         return result === void 0 ? this : result;
-      }''');
+      }''', args);
     } else {
       body = _emitConstructorBody(node, fields);
     }
diff --git a/pkg/dev_compiler/lib/src/codegen/js_names.dart b/pkg/dev_compiler/lib/src/codegen/js_names.dart
@@ -40,7 +40,7 @@ class JSNamer extends LocalNamer {
     var name = node.name;
     if (node is JSTemporary) {
       return _rename(name, valid: true);
-    } else if (invalidJSVariableName(name)) {
+    } else if (node.allowRename && invalidJSVariableName(name)) {
       return _rename(name, valid: false);
     }
     return name;
diff --git a/pkg/dev_compiler/test/codegen/expect/server_mode/html_input.html b/pkg/dev_compiler/test/codegen/expect/server_mode/html_input.html
@@ -1,7 +1,7 @@
 <html><head></head><body>
 <script src="cached/c947f9f732203b97dd2882e63da78dbe/dev_compiler/runtime/harmony_feature_check.js"></script>
 <script src="cached/1e28faa1c245886eee30f7f61662b59a/dev_compiler/runtime/dart_runtime.js"></script>
-<script src="cached/abad3421955ac52797f6445330bc291a/dev_compiler/runtime/dart/core.js"></script>
+<script src="cached/5a67eb20221232fcf6763601b852c520/dev_compiler/runtime/dart/core.js"></script>
 <script src="cached/698a3052a4b95f9f1f6e7259c2a6f005/dev_compiler/runtime/dart/collection.js"></script>
 <script src="cached/2be62665885412f7ff01a6f7b0825ebd/dev_compiler/runtime/dart/math.js"></script>
 <script src="cached/c36af93826f645c97ae65b44badd998b/dev_compiler/runtime/messages_widget.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ var core;`
`7`	`7`	`var init = this[name];`
`8`	`8`	`var result = void 0;`
`9`	`9`	`if (init)`
`10`		`- result = init.apply(this, arguments$);`
	`10`	`+ result = init.apply(this, arguments);`
`11`	`11`	`return result === void 0 ? this : result;`
`12`	`12`	`}`
`13`	`13`	`['=='](other) {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class JSNamer extends LocalNamer {`
`40`	`40`	`var name = node.name;`
`41`	`41`	`if (node is JSTemporary) {`
`42`	`42`	`return _rename(name, valid: true);`
`43`		`- } else if (invalidJSVariableName(name)) {`
	`43`	`+ } else if (node.allowRename && invalidJSVariableName(name)) {`
`44`	`44`	`return _rename(name, valid: false);`
`45`	`45`	`}`
`46`	`46`	`return name;`