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

Unified Diff: pkg/dev_compiler/lib/src/compiler/code_generator.dart

Issue 2698353003: unfork DDC's copy of most SDK libraries (Closed)
Patch Set: fix Created 3 years, 10 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
Index: pkg/dev_compiler/lib/src/compiler/code_generator.dart
diff --git a/pkg/dev_compiler/lib/src/compiler/code_generator.dart b/pkg/dev_compiler/lib/src/compiler/code_generator.dart
index a23e3e3231364ffa597584c29138e42fff158429..3249dc0aafa3b762368d6e60142cb30cba74ee29 100644
--- a/pkg/dev_compiler/lib/src/compiler/code_generator.dart
+++ b/pkg/dev_compiler/lib/src/compiler/code_generator.dart
@@ -127,7 +127,7 @@ class CodeGenerator extends GeneralizingAstVisitor
final ClassElement objectClass;
final ClassElement stringClass;
final ClassElement functionClass;
- final ClassElement symbolClass;
+ final ClassElement privateSymbolClass;
ConstFieldVisitor _constants;
@@ -174,7 +174,8 @@ class CodeGenerator extends GeneralizingAstVisitor
objectClass = _getLibrary(c, 'dart:core').getType('Object'),
stringClass = _getLibrary(c, 'dart:core').getType('String'),
functionClass = _getLibrary(c, 'dart:core').getType('Function'),
- symbolClass = _getLibrary(c, 'dart:_internal').getType('Symbol'),
+ privateSymbolClass =
+ _getLibrary(c, 'dart:_internal').getType('PrivateSymbol'),
dartJSLibrary = _getLibrary(c, 'dart:js');
LibraryElement get currentLibrary => _loader.currentElement.library;
@@ -2261,8 +2262,8 @@ class CodeGenerator extends GeneralizingAstVisitor
// Run constructor field initializers such as `: foo = bar.baz`
for (var init in ctor.initializers) {
if (init is ConstructorFieldInitializer) {
- fields[init.fieldName.staticElement as FieldElement] =
- _visit(init.expression);
+ var element = init.fieldName.staticElement as FieldElement;
+ fields[element] = _visit(init.expression);
}
}
}
@@ -5356,8 +5357,11 @@ class CodeGenerator extends GeneralizingAstVisitor
var name = js.string(node.components.join('.'), "'");
if (last.startsWith('_')) {
var nativeSymbol = _emitPrivateNameSymbol(currentLibrary, last);
- return js.call('new #.es6(#, #)',
- [_emitConstructorAccess(symbolClass.type), name, nativeSymbol]);
+ return js.call('new #(#, #)', [
+ _emitConstructorAccess(privateSymbolClass.type),
+ name,
+ nativeSymbol
+ ]);
} else {
return js
.call('#.new(#)', [_emitConstructorAccess(types.symbolType), name]);

Powered by Google App Engine
This is Rietveld 408576698