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

Unified Diff: lib/compiler/implementation/compiler.dart

Issue 10855174: Lazy implementation of final variables. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove lazy bailout initializers. Created 8 years, 3 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: lib/compiler/implementation/compiler.dart
diff --git a/lib/compiler/implementation/compiler.dart b/lib/compiler/implementation/compiler.dart
index 1b68df8719f13412a70e87a49c951672b67cbc8f..d753a5997891831555bf945f44ce294b3ca60d13 100644
--- a/lib/compiler/implementation/compiler.dart
+++ b/lib/compiler/implementation/compiler.dart
@@ -719,10 +719,18 @@ class Compiler implements DiagnosticListener {
progress.reset();
}
if (work.element.kind.category == ElementCategory.VARIABLE) {
- constantHandler.compileWorkItem(work);
- } else {
- backend.codegen(work);
+ Constant initialValue = constantHandler.compileWorkItem(work);
+ if (initialValue !== null) {
+ return;
+ } else {
+ // If the constant-handler was not able to produce a result we have to
+ // go through the builder (below) to generate the lazy initializer for
+ // the static variable.
+ // We also need to register the use of the cyclic-error helper.
+ world.registerStaticUse(cyclicThrowHelper);
+ }
}
+ backend.codegen(work);
}
void registerInstantiatedClass(ClassElement cls) {
@@ -756,6 +764,18 @@ class Compiler implements DiagnosticListener {
() => resolver.computeFunctionType(element, signature));
}
+ bool isLazilyInitialized(VariableElement element) {
+ Constant initialValue = compileVariable(element);
+ return initialValue === null;
+ }
+
+ /** Compiles compile-time constants. Must not return `null`. */
+ Constant compileConstant(VariableElement element) {
+ return withCurrentElement(element, () {
+ return constantHandler.compileConstant(element);
+ });
+ }
+
Constant compileVariable(VariableElement element) {
return withCurrentElement(element, () {
return constantHandler.compileVariable(element);
@@ -848,6 +868,10 @@ class Compiler implements DiagnosticListener {
unimplemented('Compiler.legDirectory');
}
+ Element get cyclicThrowHelper() {
+ return findHelper(const SourceString("throwCyclicInit"));
+ }
+
Element findHelper(SourceString name)
=> jsHelperLibrary.findLocal(name);
Element findInterceptor(SourceString name)

Powered by Google App Engine
This is Rietveld 408576698