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

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

Issue 868473003: dart2js: Run prepareNativeClasses in the program builder. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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/compiler/lib/src/js_emitter/old_emitter/emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
index aaca01c2e28b33b22dfbf32cea97acd92639086b..2126c10a412f33034bbe42d34b0a50eeb8b4e3cf 100644
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
@@ -52,8 +52,7 @@ class OldEmitter implements Emitter {
final Map<String, String> mangledGlobalFieldNames = <String, String>{};
final Set<String> recordedMangledNames = new Set<String>();
- final Map<Class, Map<String, jsAst.Expression>> additionalProperties =
- new Map<Class, Map<String, jsAst.Expression>>();
+ Map<Class, Map<String, jsAst.Expression>> additionalProperties;
herhut 2015/01/26 13:50:15 Have you considered not making this a field but pa
floitsch 2015/01/26 17:50:40 As written in my initial message: this field is go
List<TypedefElement> get typedefsNeededForReflection =>
task.typedefsNeededForReflection;
@@ -1775,11 +1774,7 @@ function(originalDescriptor, name, holder, isStatic, globalFunctionsAccess) {
addComment('Native classes', nativeBuffer);
- List<Class> neededClasses =
- nativeEmitter.prepareNativeClasses(program.nativeClasses,
- additionalProperties);
-
- for (Class cls in neededClasses) {
+ for (Class cls in program.nativeClasses) {
assert(cls.isNative);
ClassBuilder enclosingBuilder = getElementDescriptor(cls.element);
emitClass(cls, enclosingBuilder);
@@ -1795,6 +1790,8 @@ function(originalDescriptor, name, holder, isStatic, globalFunctionsAccess) {
Program program = programBuilder.buildProgram(
storeFunctionTypesInMetadata: true);
+ additionalProperties = program.additionalProperties;
+
// Shorten the code by using [namer.currentIsolate] as temporary.
isolateProperties = namer.currentIsolate;

Powered by Google App Engine
This is Rietveld 408576698