[VM] - Remove rules to build vm_legacy_platform

a-siva · commit-bot@chromium.org · commit 45b85e12d229 · 2019-08-29T15:57:54.000Z
Change-Id: If79375d73e24f99017cbeafd3357e03001925162 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114924 Reviewed-by: Vyacheslav Egorov <vegorov@google.com> Commit-Queue: Siva Annamalai <asiva@google.com>
diff --git a/pkg/analyzer/lib/src/util/sdk.dart b/pkg/analyzer/lib/src/util/sdk.dart
@@ -19,7 +19,7 @@ String computePlatformBinariesPath(String sdkPath) {
 
   // The given SDK path does not work.
   // Then we're probably running on bots, in 'xcodebuild/ReleaseX64'.
-  // In this case 'vm_platform.dill' is next to the 'dart'.
+  // In this case 'vm_platform_strong.dill' is next to the 'dart'.
   return path.dirname(Platform.resolvedExecutable);
 }
 
diff --git a/pkg/front_end/test/fasta/expression_test.dart b/pkg/front_end/test/fasta/expression_test.dart
@@ -388,12 +388,12 @@ Future<Context> createContext(
   final Uri entryPoint = base.resolve("nothing.dart");
 
   /// The custom URI used to locate the dill file in the MemoryFileSystem.
-  final Uri sdkSummary = base.resolve("vm_platform.dill");
+  final Uri sdkSummary = base.resolve("vm_platform_strong.dill");
 
   /// The actual location of the dill file.
   final Uri sdkSummaryFile =
       computePlatformBinariesLocation(forceBuildDir: true)
-          .resolve("vm_platform.dill");
+          .resolve("vm_platform_strong.dill");
 
   final MemoryFileSystem fs = new MemoryFileSystem(base);
 
diff --git a/pkg/front_end/test/fasta/incremental_hello_test.dart b/pkg/front_end/test/fasta/incremental_hello_test.dart
@@ -47,7 +47,7 @@ test({bool sdkFromSource}) async {
   } else {
     optionBuilder.sdkSummary =
         computePlatformBinariesLocation(forceBuildDir: true)
-            .resolve("vm_platform.dill");
+            .resolve("vm_platform_strong.dill");
   }
 
   final Uri helloDart =
diff --git a/pkg/front_end/test/fasta/incremental_test.dart b/pkg/front_end/test/fasta/incremental_test.dart
@@ -209,12 +209,12 @@ class TestCase {
 Future<Context> createContext(
     Chain suite, Map<String, String> environment) async {
   /// The custom URI used to locate the dill file in the MemoryFileSystem.
-  final Uri sdkSummary = base.resolve("vm_platform.dill");
+  final Uri sdkSummary = base.resolve("vm_platform_strong.dill");
 
   /// The actual location of the dill file.
   final Uri sdkSummaryFile =
       computePlatformBinariesLocation(forceBuildDir: true)
-          .resolve("vm_platform.dill");
+          .resolve("vm_platform_strong.dill");
 
   final MemoryFileSystem fs = new MemoryFileSystem(base);
 
diff --git a/pkg/front_end/test/incremental_load_from_dill_test.dart b/pkg/front_end/test/incremental_load_from_dill_test.dart
@@ -196,7 +196,7 @@ Future<Null> basicTest(YamlMap sourceFiles, String entryPoint,
 Future<Map<String, List<int>>> createModules(
     Map module, final List<int> sdkSummaryData) async {
   final Uri base = Uri.parse("org-dartlang-test:///");
-  final Uri sdkSummary = base.resolve("vm_platform.dill");
+  final Uri sdkSummary = base.resolve("vm_platform_strong.dill");
 
   MemoryFileSystem fs = new MemoryFileSystem(base);
   fs.entityForUri(sdkSummary).writeAsBytesSync(sdkSummaryData);
@@ -263,7 +263,7 @@ Future<Map<String, List<int>>> createModules(
 Future<Null> newWorldTest(List worlds, Map modules, bool omitPlatform) async {
   final Uri sdkRoot = computePlatformBinariesLocation(forceBuildDir: true);
   final Uri base = Uri.parse("org-dartlang-test:///");
-  final Uri sdkSummary = base.resolve("vm_platform.dill");
+  final Uri sdkSummary = base.resolve("vm_platform_strong.dill");
   final Uri initializeFrom = base.resolve("initializeFrom.dill");
   Uri platformUri = sdkRoot.resolve("vm_platform_strong.dill");
   final List<int> sdkSummaryData =
diff --git a/pkg/front_end/test/whole_program_test.dart b/pkg/front_end/test/whole_program_test.dart
@@ -52,7 +52,7 @@ Future main() async {
 
 Future runCompiler(Uri input, Uri output) async {
   final Uri platformDill = computePlatformBinariesLocation(forceBuildDir: true)
-      .resolve("vm_platform.dill");
+      .resolve("vm_platform_strong.dill");
 
   final List<String> arguments = <String>[
     '--packages=${packagesFile.toFilePath()}',
diff --git a/pkg/front_end/tool/_fasta/bulk_compile.dart b/pkg/front_end/tool/_fasta/bulk_compile.dart
@@ -39,7 +39,7 @@ class BulkCompiler {
               ..packagesFileUri ??= Uri.base.resolve(".packages")
               ..linkedDependencies = <Uri>[
                 computePlatformBinariesLocation(forceBuildDir: true)
-                    .resolve("vm_platform.dill")
+                    .resolve("vm_platform_strong.dill")
               ]
               ..fileSystem = (new FileBackedMemoryFileSystem()
                 ..entities[mainUri.path] =
diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn
@@ -142,24 +142,13 @@ template("gen_vm_platform") {
     if (defined(invoker.exclude_source) && invoker.exclude_source) {
       args += [ "--exclude-source" ]
     }
-    if (defined(invoker.legacy) && invoker.legacy) {
-      args += [ "--legacy-mode" ]
-      outline = "vm_outline_strong.dill"
-    } else {
-      outline = "vm_outline" + output_postfix + ".dill"
-    }
+    outline = "vm_outline" + output_postfix + ".dill"
     if (dart_platform_bytecode) {
       args += [ "--bytecode" ]
     }
   }
 }
 
-gen_vm_platform("vm_legacy_platform") {
-  exclude_source = false
-  legacy = true
-  output_postfix = ""
-}
-
 gen_vm_platform("vm_platform") {
   add_implicit_vm_platform_dependency = false
   exclude_source = false
@@ -174,7 +163,6 @@ gen_vm_platform("vm_platform_stripped") {
 
 group("kernel_platform_files") {
   public_deps = [
-    ":vm_legacy_platform",
     ":vm_platform",
     ":vm_platform_stripped",
   ]

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ String computePlatformBinariesPath(String sdkPath) {`
`19`	`19`
`20`	`20`	`// The given SDK path does not work.`
`21`	`21`	`// Then we're probably running on bots, in 'xcodebuild/ReleaseX64'.`
`22`		`- // In this case 'vm_platform.dill' is next to the 'dart'.`
	`22`	`+ // In this case 'vm_platform_strong.dill' is next to the 'dart'.`
`23`	`23`	`return path.dirname(Platform.resolvedExecutable);`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ test({bool sdkFromSource}) async {`
`47`	`47`	`} else {`
`48`	`48`	`optionBuilder.sdkSummary =`
`49`	`49`	`computePlatformBinariesLocation(forceBuildDir: true)`
`50`		`- .resolve("vm_platform.dill");`
	`50`	`+ .resolve("vm_platform_strong.dill");`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`final Uri helloDart =`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class BulkCompiler {`
`39`	`39`	`..packagesFileUri ??= Uri.base.resolve(".packages")`
`40`	`40`	`..linkedDependencies = <Uri>[`
`41`	`41`	`computePlatformBinariesLocation(forceBuildDir: true)`
`42`		`- .resolve("vm_platform.dill")`
	`42`	`+ .resolve("vm_platform_strong.dill")`
`43`	`43`	`]`
`44`	`44`	`..fileSystem = (new FileBackedMemoryFileSystem()`
`45`	`45`	`..entities[mainUri.path] =`