Index: pkg/compiler/lib/src/ssa/codegen.dart |
diff --git a/pkg/compiler/lib/src/ssa/codegen.dart b/pkg/compiler/lib/src/ssa/codegen.dart |
index c23534849e2db61af309843f148fede61c7b15c5..0d6376ecd83102490e74afed5f99d485b0b4c269 100644 |
--- a/pkg/compiler/lib/src/ssa/codegen.dart |
+++ b/pkg/compiler/lib/src/ssa/codegen.dart |
@@ -2858,7 +2858,7 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor { |
void visitTypeInfoReadRaw(HTypeInfoReadRaw node) { |
use(node.inputs[0]); |
js.Expression receiver = pop(); |
- push(js.js(r'#.$builtinTypeInfo', receiver)); |
+ push(js.js(r'#.#', [receiver, backend.namer.rtiFieldName])); |
} |
void visitTypeInfoReadVariable(HTypeInfoReadVariable node) { |
@@ -2937,8 +2937,15 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor { |
js.Expression receiver = pop(); |
js.Expression helper = |
backend.emitter.staticFunctionAccess(helperElement); |
- push(js.js(r'#(#.$builtinTypeInfo && #.$builtinTypeInfo[#])', |
- [helper, receiver, receiver, js.js.number(index)])); |
+ js.Expression rtiFieldName = backend.namer.rtiFieldName; |
+ push(js.js(r'#(#.# && #.#[#])', [ |
+ helper, |
+ receiver, |
+ rtiFieldName, |
+ receiver, |
+ rtiFieldName, |
+ js.js.number(index) |
+ ])); |
} else { |
backend.emitter.registerReadTypeVariable(element); |
push(js.js( |