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

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

Issue 841993003: dart2js: Only emit constructors of the native class interceptors that are used. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Incorporating changes from Issue 854133003. Adds return in emitClassConstructor plus some renames. 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/native_emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/native_emitter.dart b/pkg/compiler/lib/src/js_emitter/native_emitter.dart
index 1817b09ef8ef6d93629904cdd6d0200d88ec3bf2..a4d86abdf560d7d16669974c170b3c6377de35f0 100644
--- a/pkg/compiler/lib/src/js_emitter/native_emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/native_emitter.dart
@@ -232,6 +232,22 @@ class NativeEmitter {
for (ClassElement classElement in classes) {
if (!classElement.isNative) continue;
if (neededClasses.contains(classElement)) {
+ ClassBuilder builder = builders[classElement];
+
+ // In CSP mode [emitClassConstructor] and [emitClassGettersSetters] have
+ // a side-effect on "precompiled" functions in [OldEmitter]. For this
+ // reason, it is important that we don't call these methods before we
+ // are certain that a class is needed.
+
+ emitterTask.oldEmitter.classEmitter
+ .emitPrecompiledConstructor(classElement);
+
+ // [emitClassGettersSettersForCSP] does not affect whether or not a
+ // class is needed. If getters/setters are emitted, the class has fields
+ // and is therefore non-trivial.
+ emitterTask.oldEmitter.classEmitter.emitClassGettersSettersForCSP(
+ classElement, builder);
+
// Define interceptor class for [classElement].
emitterTask.oldEmitter.classEmitter.emitClassBuilderWithReflectionData(
backend.namer.getNameOfClass(classElement),
@@ -301,12 +317,10 @@ class NativeEmitter {
}
builder.superName = superName;
- emitterTask.oldEmitter.classEmitter.emitClassConstructor(
- classElement, builder);
bool hasFields = emitterTask.oldEmitter.classEmitter.emitFields(
classElement, builder, classIsNative: true);
int propertyCount = builder.properties.length;
- emitterTask.oldEmitter.classEmitter.emitClassGettersSetters(
+ emitterTask.oldEmitter.classEmitter.emitCheckedClassSetters(
classElement, builder);
emitterTask.oldEmitter.classEmitter.emitInstanceMembers(
classElement, builder);

Powered by Google App Engine
This is Rietveld 408576698