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

Unified Diff: pkg/compiler/lib/src/js_emitter/new_emitter/emitter.dart

Issue 1220793012: Revert "Fix runtimeType.toString for tear-offs." (Closed) Base URL: git@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
« no previous file with comments | « no previous file | pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/js_emitter/new_emitter/emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/new_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/new_emitter/emitter.dart
index 242c7e4592ecbf3e060ec2b311cffd40068f89a1..b431c6d65645fb692371ce6d6c027c549ec0c726 100644
--- a/pkg/compiler/lib/src/js_emitter/new_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/new_emitter/emitter.dart
@@ -132,6 +132,8 @@ class Emitter implements emitterTask.Emitter {
@override
js.Template templateForBuiltin(JsBuiltin builtin) {
+ String typeNameProperty = ModelEmitter.typeNameProperty;
+
switch (builtin) {
case JsBuiltin.dartObjectConstructor:
return js.js.expressionTemplateYielding(
@@ -145,7 +147,7 @@ class Emitter implements emitterTask.Emitter {
return _backend.rti.representationGenerator.templateForIsFunctionType;
case JsBuiltin.rawRtiToJsConstructorName:
- return js.js.expressionTemplateFor("#.name");
+ return js.js.expressionTemplateFor("#.$typeNameProperty");
case JsBuiltin.rawRuntimeType:
return js.js.expressionTemplateFor("#.constructor");
@@ -161,7 +163,7 @@ class Emitter implements emitterTask.Emitter {
return js.js.expressionTemplateFor("('$isPrefix' + #) in #.prototype");
case JsBuiltin.isGivenTypeRti:
- return js.js.expressionTemplateFor('#.name === #');
+ return js.js.expressionTemplateFor('#.$typeNameProperty === #');
case JsBuiltin.getMetadata:
return _emitter.templateForReadMetadata;
« no previous file with comments | « no previous file | pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698