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

Unified Diff: pkg/compiler/lib/src/js_emitter/program_builder.dart

Issue 859843002: dart2js: use model in native emitter. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Revert debug code. 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/program_builder.dart
diff --git a/pkg/compiler/lib/src/js_emitter/program_builder.dart b/pkg/compiler/lib/src/js_emitter/program_builder.dart
index f1144e586093e1be2dfc7a4a83674818ce66dae0..777a2de552d77a9153c7074272e4cc94b57ed444 100644
--- a/pkg/compiler/lib/src/js_emitter/program_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/program_builder.dart
@@ -80,22 +80,31 @@ class ProgramBuilder {
outputs[0] = mainOutput;
outputs.setAll(1, deferredOutputs);
- Program result =
- new Program(outputs, _task.outputContainsConstantList, _buildLoadMap());
+ List<Class> nativeClasses = _task.nativeClasses
+ .map((ClassElement classElement) {
+ Class result = _classes[classElement];
+ return (result == null) ? _buildClass(classElement) : result;
+ })
+ .toList();
// Resolve the superclass references after we've processed all the classes.
_classes.forEach((ClassElement element, Class c) {
if (element.superclass != null) {
c.setSuperclass(_classes[element.superclass]);
+ assert(c.superclass != null);
}
if (c is MixinApplication) {
c.setMixinClass(_classes[computeMixinClass(element)]);
+ assert(c.mixinClass != null);
}
});
_markEagerClasses();
- return result;
+ return new Program(outputs,
+ nativeClasses,
+ _task.outputContainsConstantList,
+ _buildLoadMap());
}
void _markEagerClasses() {
@@ -299,6 +308,7 @@ class ProgramBuilder {
Class result;
if (element.isMixinApplication && !onlyForRti) {
+ assert(!element.isNative);
result = new MixinApplication(element,
name, holder, methods, fields,
isDirectlyInstantiated: isInstantiated,
@@ -307,7 +317,8 @@ class ProgramBuilder {
result = new Class(element,
name, holder, methods, fields,
isDirectlyInstantiated: isInstantiated,
- onlyForRti: onlyForRti);
+ onlyForRti: onlyForRti,
+ isNative: element.isNative);
}
_classes[element] = result;
return result;

Powered by Google App Engine
This is Rietveld 408576698