Always use ir constants in annotations when constant-update-2018 is enabled

Change-Id: Ib5ba6a908904c36a8580f6f47424b6982800dddd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98002
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Sigmund Cherem <[email protected]>

Author: johnniwinther

pkg/compiler/lib/src/kernel/kernel_strategy.dart

@@ -70,7 +70,7 @@ class KernelFrontEndStrategy extends FrontendStrategyBase {
   @override
   void registerLoadedLibraries(KernelResult kernelResult) {
     _elementMap.addComponent(kernelResult.component);
-    if (useIrAnnotationsDataForTesting) {
+    if (_options.useCFEConstants) {
       _irAnnotationData = processAnnotations(kernelResult.component);
     }
     _annotationProcessor = new KernelAnnotationProcessor(
@@ -322,10 +322,6 @@ class KernelWorkItem implements WorkItem {
 /// the world impact computation.
 bool useImpactDataForTesting = false;
 
-/// If `true` pragma annotations are computed directly on kernel. This is a
-/// pre-step to modularizing the world impact computation.
-bool useIrAnnotationsDataForTesting = false;
-
 class KernelModularStrategy extends ModularStrategy {
   final CompilerTask _compilerTask;
   final KernelToElementMapImpl _elementMap;
@@ -334,7 +330,7 @@ class KernelModularStrategy extends ModularStrategy {
 
   @override
   List<PragmaAnnotationData> getPragmaAnnotationData(ir.Member node) {
-    if (useIrAnnotationsDataForTesting) {
+    if (_elementMap.options.useCFEConstants) {
       return computePragmaAnnotationDataFromIr(node);
     } else {
       return computePragmaAnnotationData(_elementMap.commonElements,

pkg/compiler/lib/src/options.dart

@@ -96,6 +96,10 @@ class CompilerOptions implements DiagnosticOptions {
   /// Flags enabling language experiments.
   Map<fe.ExperimentalFlag, bool> languageExperiments = {};
 
+  /// `true` if CFE performs constant evaluation.
+  bool get useCFEConstants =>
+      languageExperiments[fe.ExperimentalFlag.constantUpdate2018];
+
   /// A possibly null state object for kernel compilation.
   fe.InitializedCompilerState kernelInitializedCompilerState;
 

tests/compiler/dart2js/inference/data/native.dart

@@ -7,11 +7,7 @@ main() {
   nativeMethod();
 }
 
-/*strong.element: nativeMethod:[null|subclass=Object]*/
-/*omit.element: nativeMethod:[null|subclass=Object]*/
-// TODO(johnniwinther): Support native behavior from CFE constants:
-/*strongConst.element: nativeMethod:[null]*/
-/*omitConst.element: nativeMethod:[null]*/
+/*element: nativeMethod:[null|subclass=Object]*/
 nativeMethod()
     // ignore: NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE
     native;

tests/compiler/dart2js/inference/data/native2.dart

@@ -12,11 +12,7 @@ main() {
   createRectangle();
 }
 
-/*strong.element: createElement:[null|subclass=Element]*/
-/*omit.element: createElement:[null|subclass=Element]*/
-// TODO(johnniwinther): Support native behavior from CFE constants:
-/*strongConst.element: createElement:[null]*/
-/*omitConst.element: createElement:[null]*/
+/*element: createElement:[null|subclass=Element]*/
 Element createElement()
     // ignore: NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE
     native;

tests/compiler/dart2js/inference/data/native3.dart

@@ -9,11 +9,7 @@ main() {
   createRectangle();
 }
 
-/*strong.element: createRectangle:[null|subclass=DomRectReadOnly]*/
-/*omit.element: createRectangle:[null|subclass=DomRectReadOnly]*/
-// TODO(johnniwinther): Support native behavior from CFE constants:
-/*strongConst.element: createRectangle:[null]*/
-/*omitConst.element: createRectangle:[null]*/
+/*element: createRectangle:[null|subclass=DomRectReadOnly]*/
 Rectangle createRectangle()
     // ignore: NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE
     native;

tests/compiler/dart2js/model/cfe_annotations_test.dart

@@ -186,7 +186,6 @@ main(List<String> args) {
     List<String> options = getOptions(argResults);
 
     runTest({bool useIr}) async {
-      useIrAnnotationsDataForTesting = useIr;
       CompilationResult result = await runCompiler(
           entryPoint: Uri.parse('memory:$pathPrefix/main.dart'),
           memorySourceFiles: source,