[ddk] Pass environmentDefines to CFE through CompilerOptions

mraleph · commit-bot@chromium.org · commit fce43ebc4ebd · 2019-07-09T07:48:32.000Z
CFE needs to have access to them to be able to perform constant evaluation. Bug: #37357 Change-Id: I15705e6fda330a05765ec2e8354051276cb88b07 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108278 Auto-Submit: Vyacheslav Egorov <vegorov@google.com> Reviewed-by: Vijay Menon <vsm@google.com> Reviewed-by: Jens Johansen <jensj@google.com> Commit-Queue: Vyacheslav Egorov <vegorov@google.com>
diff --git a/pkg/dev_compiler/lib/src/kernel/command.dart b/pkg/dev_compiler/lib/src/kernel/command.dart
@@ -246,7 +246,8 @@ Future<CompilerResult> _compile(List<String> args,
         DevCompilerTarget(
             TargetFlags(trackWidgetCreation: trackWidgetCreation)),
         fileSystem: fileSystem,
-        experiments: experiments);
+        experiments: experiments,
+        environmentDefines: declaredVariables);
   } else {
     doneInputSummaries = List<Component>(summaryModules.length);
     compilerState = await fe.initializeIncrementalCompiler(
@@ -262,7 +263,8 @@ Future<CompilerResult> _compile(List<String> args,
         DevCompilerTarget(
             TargetFlags(trackWidgetCreation: trackWidgetCreation)),
         fileSystem: fileSystem,
-        experiments: experiments);
+        experiments: experiments,
+        environmentDefines: declaredVariables);
     incrementalCompiler = compilerState.incrementalCompiler;
     cachedSdkInput =
         compilerState.workerInputCache[sourcePathToUri(sdkSummaryPath)];
diff --git a/pkg/front_end/lib/src/api_unstable/ddc.dart b/pkg/front_end/lib/src/api_unstable/ddc.dart
@@ -81,7 +81,8 @@ Future<InitializedCompilerState> initializeCompiler(
     List<Uri> inputSummaries,
     Target target,
     {FileSystem fileSystem,
-    Map<ExperimentalFlag, bool> experiments}) async {
+    Map<ExperimentalFlag, bool> experiments,
+    Map<String, String> environmentDefines}) async {
   inputSummaries.sort((a, b) => a.toString().compareTo(b.toString()));
 
   if (oldState != null &&
@@ -90,7 +91,8 @@ Future<InitializedCompilerState> initializeCompiler(
       oldState.options.packagesFileUri == packagesFile &&
       oldState.options.librariesSpecificationUri == librariesSpecificationUri &&
       equalLists(oldState.options.inputSummaries, inputSummaries) &&
-      equalMaps(oldState.options.experimentalFlags, experiments)) {
+      equalMaps(oldState.options.experimentalFlags, experiments) &&
+      equalMaps(oldState.options.environmentDefines, environmentDefines)) {
     // Reuse old state.
 
     // These libraries are marked external when compiling. If not un-marking
@@ -114,7 +116,8 @@ Future<InitializedCompilerState> initializeCompiler(
     ..inputSummaries = inputSummaries
     ..librariesSpecificationUri = librariesSpecificationUri
     ..target = target
-    ..fileSystem = fileSystem ?? StandardFileSystem.instance;
+    ..fileSystem = fileSystem ?? StandardFileSystem.instance
+    ..environmentDefines = environmentDefines;
   if (experiments != null) options.experimentalFlags = experiments;
 
   ProcessedOptions processedOpts = new ProcessedOptions(options: options);
@@ -134,7 +137,8 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
     Map<Uri, List<int>> workerInputDigests,
     Target target,
     {FileSystem fileSystem,
-    Map<ExperimentalFlag, bool> experiments}) async {
+    Map<ExperimentalFlag, bool> experiments,
+    Map<String, String> environmentDefines}) async {
   inputSummaries.sort((a, b) => a.toString().compareTo(b.toString()));
 
   IncrementalCompiler incrementalCompiler;
@@ -156,7 +160,8 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
       oldState.options.compileSdk != compileSdk ||
       cachedSdkInput == null ||
       !digestsEqual(cachedSdkInput.digest, sdkDigest) ||
-      !equalMaps(oldState.options.experimentalFlags, experiments)) {
+      !equalMaps(oldState.options.experimentalFlags, experiments) ||
+      !equalMaps(oldState.options.environmentDefines, environmentDefines)) {
     // No previous state.
     options = new CompilerOptions()
       ..compileSdk = compileSdk
@@ -166,7 +171,8 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
       ..inputSummaries = inputSummaries
       ..librariesSpecificationUri = librariesSpecificationUri
       ..target = target
-      ..fileSystem = fileSystem ?? StandardFileSystem.instance;
+      ..fileSystem = fileSystem ?? StandardFileSystem.instance
+      ..environmentDefines = environmentDefines;
     if (experiments != null) options.experimentalFlags = experiments;
 
     // We'll load a new sdk, anything loaded already will have a wrong root.
