Update JSCompiler stage 2 save/restore flags to match MSS compiler flags

This change deletes the `restore_stage1_from_file` and `save_stage2_to_file` flag from JSCompiler and replaces them with the new `stage2_filename_to_restore_from` and `stage2_filename_to_save_to flags`.

PiperOrigin-RevId: 733876143

Author: rahul-kamat

src/com/google/javascript/jscomp/CommandLineRunner.java

@@ -265,13 +265,6 @@ private static class Flags {
         hidden = true)
     private @Nullable String continueSavedCompilationFile = null;
 
-    // TODO(b/395966861): deprecate and remove this in favor of --stage2_filename_to_restore_from
-    @Option(
-        name = "--restore_stage1_from_file",
-        usage = "Filename where a stage 1 compilation state was previously saved.",
-        hidden = true)
-    private @Nullable String restoreStage1FromFile = null;
-
     @Option(
         name = "--stage2_filename_to_restore_from",
         usage = "Filename where a stage 2 compilation state was previously saved.",
@@ -297,13 +290,6 @@ private static class Flags {
         hidden = true)
     private @Nullable String saveStage1ToFile = null;
 
-    // TODO(b/395966861): deprecate and remove this in favor of --stage2_filename_to_save_to
-    @Option(
-        name = "--save_stage2_to_file",
-        usage = "Filename to save stage 2 state so that the compilation can be resumed later.",
-        hidden = true)
-    private @Nullable String saveStage2ToFile = null;
-
     @Option(
         name = "--stage2_filename_to_save_to",
         usage = "Filename to save stage 2 state so that the compilation can be resumed later.",
@@ -1802,11 +1788,7 @@ private void initConfigFromFlags(String[] args, PrintStream out, PrintStream err
           .setJsonStreamMode(flags.jsonStreamMode)
           .setErrorFormat(flags.errorFormat);
 
-      String stage1RestoreFile = flags.restoreStage1FromFile;
-      if (stage1RestoreFile == null) {
-        // TODO(b/395966861): delete the `flags.restoreStage1FromFile` flag and just use this one
-        stage1RestoreFile = flags.stage2FilenameToRestoreFrom;
-      }
+      String stage1RestoreFile = flags.stage2FilenameToRestoreFrom;
       if (stage1RestoreFile == null) {
         // TODO(bradfordcsmith): deprecate and remove this flag
         stage1RestoreFile = flags.continueSavedCompilationFile;
@@ -1828,11 +1810,7 @@ private void initConfigFromFlags(String[] args, PrintStream out, PrintStream err
         // TODO(bradfordcsmith): deprecate and remove this flag
         stage1SaveFile = flags.saveAfterChecksFile;
       }
-      String stage2SaveFile = flags.saveStage2ToFile;
-      if (stage2SaveFile == null) {
-        // TODO(b/395966861): delete the `flags.saveStage2ToFile` flag and just use this one
-        stage2SaveFile = flags.stage2FilenameToSaveTo;
-      }
+      String stage2SaveFile = flags.stage2FilenameToSaveTo;
       if (stage1SaveFile != null) {
         checkState(stage2SaveFile == null, "cannot save both stage 1 and stage 2");
         checkState(stage1RestoreFile == null, "cannot perform stage 1 on a restored stage 1");

test/com/google/javascript/jscomp/CommandLineRunnerTest.java

@@ -186,143 +186,6 @@ public void testStage1ErrorExitStatus() throws Exception {
     assertThat(new String(outReader.toByteArray(), UTF_8)).isEmpty();
   }
 
-  // TODO(b/395966861): delete this test, `test3StageCompile` is the same test but uses the new
-  // stage 2 flags.
-  @Test
-  public void test3StageCompile_Old() throws Exception {
-
-    // Create a message bundle to use
-    File msgBundle = temporaryFolder.newFile("messages.xtb");
-    final ImmutableList<String> lines =
-        ImmutableList.of(
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
-            "<!DOCTYPE translationbundle SYSTEM \"translationbundle.dtd\">",
-            "<translationbundle lang=\"es\">",
-            "<translation id=\"6289482750305328564\">hola</translation>",
-            "</translationbundle>",
-            "");
-    writeLinesToFile(msgBundle, lines);
-
-    // Create test externs with a definition for goog.getMsg().
-    final File externsFile = temporaryFolder.newFile("externs.js");
-    writeLinesToFile(
-        externsFile,
-        "/**",
-        " * @fileoverview test externs",
-        " * @externs",
-        " */",
-        "var goog = {};",
-        "/**",
-        " * @nosideeffects",
-        " * @param {string} msg",
-        " * @param {Object=} placeholderReplacements",
-        " * @param {Object=} options",
-        " * @return {string}",
-        " */",
-        "goog.getMsg = function(msg, placeholderReplacements, options) {};");
-
-    // Create an input file
-    File srcFile = temporaryFolder.newFile("input.js");
-    writeLinesToFile(
-        srcFile,
-        "/** @desc greeting */",
-        "const MSG_HELLO = goog.getMsg('hello');",
-        "console.log(MSG_HELLO);");
-
-    // Create a path for the stage 1 output
-    File stage1Save = temporaryFolder.newFile("stage1.save");
-
-    ImmutableList<String> commonFlags =
-        ImmutableList.of(
-            "--compilation_level=ADVANCED_OPTIMIZATIONS",
-            "--source_map_include_content",
-            "--translations_file",
-            msgBundle.toString(),
-            "--externs",
-            externsFile.toString(),
-            "--js",
-            srcFile.toString());
-
-    // Run the compiler to generate the stage 1 save file
-    final ImmutableList<String> stage1Flags =
-        createStringList(
-            commonFlags, new String[] {"--save_stage1_to_file", stage1Save.toString()});
-    verifyFlagsAreIncompatibleWithChecksOnly(stage1Flags);
-    CommandLineRunner runner =
-        new CommandLineRunner(
-            stringListToArray(stage1Flags), new PrintStream(outReader), new PrintStream(errReader));
-    assertThat(runner.doRun()).isEqualTo(0);
-    assertThat(new String(outReader.toByteArray(), UTF_8)).isEmpty();
-
-    assertThat(runner.getCompiler().toSource())
-        .isEqualTo("const MSG_HELLO=goog.getMsg(\"hello\");console.log(MSG_HELLO);");
-
-    // Create a path for the stage 2 output
-    File stage2Save = temporaryFolder.newFile("stage2.save");
-    // run the compiler to generate the stage 2 save file
-    final ImmutableList<String> stage2Flags =
-        createStringList(
-            commonFlags,
-            new String[] {
-              "--restore_stage1_from_file",
-              stage1Save.toString(),
-              "--save_stage2_to_file",
-              stage2Save.toString()
-            });
-    verifyFlagsAreIncompatibleWithChecksOnly(stage2Flags);
-    runner = new CommandLineRunner(stringListToArray(stage2Flags));
-    assertThat(runner.doRun()).isEqualTo(0);
-
-    // During stage 2 the message is wrapped in a function call to protect it from mangling by
-    // optimizations.
-    assertThat(runner.getCompiler().toSource())
-        .isEqualTo(
-            concatStrings(
-                "console.log(",
-                "__jscomp_define_msg__({\"key\":\"MSG_HELLO\",\"msg_text\":\"hello\"})",
-                ");"));
-
-    // Create a path for the final output
-    File compiledFile = temporaryFolder.newFile("compiled.js");
-    // Create a path for the output source map
-    File sourceMapFile = temporaryFolder.newFile("compiled.sourcemap");
-
-    // run the compiler to generate the final output
-    final ImmutableList<String> stage3Flags =
-        createStringList(
-            commonFlags,
-            new String[] {
-              "--restore_stage2_from_file",
-              stage2Save.toString(),
-              "--js_output_file",
-              compiledFile.toString(),
-              "--create_source_map",
-              sourceMapFile.toString()
-            });
-    verifyFlagsAreIncompatibleWithChecksOnly(stage3Flags);
-    runner = new CommandLineRunner(stringListToArray(stage3Flags));
-    assertThat(runner.doRun()).isEqualTo(0);
-
-    // During stage 3 the message is actually replaced and the output written to the compiled
-    // output file.
-    final String compiledJs = java.nio.file.Files.readString(compiledFile.toPath());
-    assertThat(compiledJs).isEqualTo("console.log(\"hola\");\n");
-
-    final JsonObject expectedSourceMap = new JsonObject();
-    expectedSourceMap.addProperty("version", 3);
-    expectedSourceMap.addProperty("file", compiledFile.getAbsolutePath());
-    expectedSourceMap.addProperty("lineCount", 1);
-    expectedSourceMap.addProperty("mappings", "AAEAA,OAAQC,CAAAA,GAAR,CADkBC,MAClB;");
-    expectedSourceMap.add("sources", newJsonArrayOfStrings(srcFile.getAbsolutePath()));
-    expectedSourceMap.add(
-        "sourcesContent", newJsonArrayOfStrings(java.nio.file.Files.readString(srcFile.toPath())));
-    expectedSourceMap.add("names", newJsonArrayOfStrings("console", "log", "MSG_HELLO"));
-
-    final String sourceMapText = java.nio.file.Files.readString(sourceMapFile.toPath());
-    JsonObject actualSourceMap = getJsonObjectFromJson(sourceMapText);
-    assertThat(actualSourceMap).isEqualTo(expectedSourceMap);
-  }
-
   @Test
   public void test3StageCompile() throws Exception {