Index: pkg/compiler/lib/src/ssa/ssa.dart |
diff --git a/pkg/compiler/lib/src/ssa/ssa.dart b/pkg/compiler/lib/src/ssa/ssa.dart |
index ba197d12af9873c12ad2612799e0473dfeb92b79..5fa813029b174221815a5db3345c4f1949cbb925 100644 |
--- a/pkg/compiler/lib/src/ssa/ssa.dart |
+++ b/pkg/compiler/lib/src/ssa/ssa.dart |
@@ -4,13 +4,16 @@ |
library ssa; |
-import '../common/codegen.dart' show CodegenWorkItem; |
+import '../common/codegen.dart' show CodegenWorkItem, CodegenRegistry; |
import '../common/tasks.dart' show CompilerTask, Measurer; |
+import '../constants/values.dart'; |
import '../elements/elements.dart' show MethodElement; |
-import '../elements/entities.dart' show MemberEntity; |
+import '../elements/entities.dart' show FieldEntity, MemberEntity; |
import '../io/source_information.dart'; |
import '../js/js.dart' as js; |
import '../js_backend/backend.dart' show JavaScriptBackend, FunctionCompiler; |
+import '../universe/call_structure.dart'; |
+import '../universe/use.dart'; |
import '../world.dart' show ClosedWorld; |
import 'codegen.dart'; |
@@ -57,3 +60,43 @@ abstract class SsaBuilderTask implements CompilerTask { |
/// for [work]. |
HGraph build(CodegenWorkItem work, ClosedWorld closedWorld); |
} |
+ |
+abstract class SsaBuilderFieldMixin { |
+ ConstantValue getFieldInitialConstantValue(FieldEntity field); |
+ |
+ /// Handle field initializer of `work.element`. Returns `true` if no code |
Siggi Cherem (dart-lang)
2017/06/15 18:28:55
nit: `work.element` => [element]
(here and below)
Johnni Winther
2017/06/16 09:25:31
Done.
|
+ /// is needed for the field. |
+ /// |
+ /// If `work.element` is a field with a constant initializer, the value is |
+ /// registered with the world impact. Otherwise the cyclic-throw helper is |
+ /// registered for the lazy value computation. |
+ /// |
+ /// If the field is constant, no code is needed for the field and the method |
+ /// return `true`. |
Emily Fortuna
2017/06/15 17:54:34
return -> returns
Johnni Winther
2017/06/16 09:25:31
Done.
|
+ bool handleConstantField( |
+ MemberEntity element, CodegenRegistry registry, ClosedWorld closedWorld) { |
+ if (element.isField) { |
+ ConstantValue initialValue = getFieldInitialConstantValue(element); |
+ if (initialValue != null) { |
+ registry.worldImpact |
+ .registerConstantUse(new ConstantUse.init(initialValue)); |
+ // We don't need to generate code for static or top-level |
+ // variables. For instance variables, we may need to generate |
Emily Fortuna
2017/06/15 17:54:34
sorry, I don't understand why we don't need to gen
Johnni Winther
2017/06/16 09:25:31
All references inline the constant value. Add this
|
+ // the checked setter. |
+ if (element.isStatic || element.isTopLevel) { |
+ /// No code is created for this field. |
+ return true; |
+ } |
+ } 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. |
+ registry.worldImpact.registerStaticUse(new StaticUse.staticInvoke( |
+ closedWorld.commonElements.cyclicThrowHelper, |
+ CallStructure.ONE_ARG)); |
+ } |
+ } |
+ return false; |
+ } |
+} |