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

Unified Diff: dart/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart

Issue 17315012: Generate less code when importing dart:mirrors. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 6 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: dart/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
diff --git a/dart/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart b/dart/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
index 8567adb1d0d08ac55742a1b4016569174eb74638..6013649894ef8dcd92c283fe3aeeb425fc2e4ea7 100644
--- a/dart/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
+++ b/dart/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
@@ -156,6 +156,27 @@ class JavaScriptBackend extends Backend {
/// dart:mirrors has been loaded.
FunctionElement preserveNamesMarker;
+ /// Holds the method "preserveMetadata" in js_mirrors when
+ /// dart:mirrors has been loaded.
+ FunctionElement preserveMetadataMarker;
+
+ bool mustRetainMetadata = false;
+ bool retainedMetadata = false;
kasperl 2013/06/20 07:16:46 Add a comment that explains the difference between
ahe 2013/06/21 12:24:39 Done.
+ bool mustPreserveNames = false;
+ bool isTreeShakingDisabled = false;
+
+ /// List of instantiated classes from metadata. If metadata must be
+ /// preserved, these classes must registered.
+ final List<List> metadataInstantiatedClasses = <List>[];
Johnni Winther 2013/06/20 10:17:02 Add a comment of what the content of the list of l
ahe 2013/06/21 12:24:39 I added a class to represent this concept, a depen
+
+ /// List of elements used from metadata. If metadata must be preserved,
+ /// these elements must be compiled.
+ final List<Element> metadataStaticUse = <Element>[];
+
+ /// List of tear-off functions referenced from metadata. If metadata must be
+ /// preserved, these elements must be compiled.
+ final List<FunctionElement> metadataGetOfStaticFunction = <FunctionElement>[];
+
JavaScriptBackend(Compiler compiler, bool generateSourceMap, bool disableEval)
: namer = determineNamer(compiler),
oneShotInterceptors = new Map<String, Selector>(),
@@ -597,8 +618,11 @@ class JavaScriptBackend extends Backend {
enqueueInResolution(getCyclicThrowHelper(), elements);
}
- void registerTypeLiteral(TreeElements elements) {
+ void registerTypeLiteral(Element element, TreeElements elements) {
enqueueInResolution(getCreateRuntimeType(), elements);
+ // TODO(ahe): Might want to register [element] as an instantiated class
+ // when reflection is used. However, as long as we disable tree-shaking
+ // eagerly it doesn't matter.
}
void registerStackTraceInCatch(TreeElements elements) {
@@ -1110,19 +1134,95 @@ class JavaScriptBackend extends Backend {
ClassElement get boolImplementation => jsBoolClass;
ClassElement get nullImplementation => jsNullClass;
- void enableMirrors() {
- LibraryElement library = compiler.libraries['dart:_js_mirrors'];
- disableTreeShakingMarker =
- library.find(const SourceString('disableTreeShaking'));
- preserveNamesMarker =
- library.find(const SourceString('preserveNames'));
- }
-
void registerStaticUse(Element element, Enqueuer enqueuer) {
if (element == disableTreeShakingMarker) {
enqueuer.enqueueEverything();
+ if (isTreeShakingDisabled) return;
compiler.disableTypeInferenceForMirrors = true;
+ isTreeShakingDisabled = true;
} else if (element == preserveNamesMarker) {
+ if (mustPreserveNames) return;
+ mustPreserveNames = true;
+ compiler.log('Preserving names.');
+ } else if (element == preserveMetadataMarker) {
+ if (mustRetainMetadata) return;
+ compiler.log('Retaining metadata.');
+ mustRetainMetadata = true;
+ for (LibraryElement library in compiler.libraries.values) {
+ if (retainMetadataOf(library)) {
+ for (Link link = library.metadata; !link.isEmpty; link = link.tail) {
+ link.head.ensureResolved(compiler);
+ }
+ }
+ }
+ for (List entries in metadataInstantiatedClasses) {
+ registerMetadataInstantiatedClass(entries[0], entries[1]);
+ }
+ metadataInstantiatedClasses.clear();
+ for (Element e in metadataStaticUse) {
+ registerMetadataStaticUse(e);
+ }
+ metadataStaticUse.clear();
+ for (Element e in metadataGetOfStaticFunction) {
+ registerMetadataGetOfStaticFunction(e);
+ }
+ metadataGetOfStaticFunction.clear();
+ }
+ }
+
+ /// Called when [:const Symbol(name):] is seen.
+ void registerConstSymbol(String name, TreeElements elements) {
+ }
+
+ /// Called when [:new Symbol(...):] is seen.
+ void registerNewSymbol(TreeElements elements) {
+ }
+
+ bool retainGetter(Element element) => isTreeShakingDisabled;
+
+ bool retainSetter(Element element) => isTreeShakingDisabled;
+
+ bool retainName(SourceString name) => mustPreserveNames;
+
+ bool retainMetadataOf(Element element) {
+ if (mustRetainMetadata) retainedMetadata = true;
+ return mustRetainMetadata;
+ }
+
+ void onLibraryScanned(LibraryElement library, Uri uri) {
+ if (uri == Uri.parse('dart:_js_mirrors')) {
+ disableTreeShakingMarker =
+ library.find(const SourceString('disableTreeShaking'));
+ preserveMetadataMarker =
+ library.find(const SourceString('preserveMetadata'));
+ } else if (uri == Uri.parse('dart:_js_names')) {
+ preserveNamesMarker =
+ library.find(const SourceString('preserveNames'));
+ }
+ }
+
+ void registerMetadataInstantiatedClass(ClassElement element,
+ TreeElements elements) {
+ if (mustRetainMetadata) {
+ compiler.constantHandler.registerInstantiatedClass(element, elements);
+ } else {
+ metadataInstantiatedClasses.add([element, elements]);
+ }
+ }
+
+ void registerMetadataStaticUse(Element element) {
+ if (mustRetainMetadata) {
+ compiler.constantHandler.registerStaticUse(element);
+ } else {
+ metadataStaticUse.add(element);
+ }
+ }
+
+ void registerMetadataGetOfStaticFunction(FunctionElement element) {
+ if (mustRetainMetadata) {
+ compiler.constantHandler.registerGetOfStaticFunction(element);
+ } else {
+ metadataGetOfStaticFunction.add(element);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698