Skip to content

Commit c464aa5

Browse files
rahul-kamatcopybara-github
authored andcommitted
Rewrite all calls to performTranspilationAndOptimizations() to specify what list of stage 2 passes to run.
This CL just specifies that every call should request to run `ALL` stage 2 passes. PiperOrigin-RevId: 716429985
1 parent 14eac71 commit c464aa5

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ public void stage2Passes() {
10561056
runInCompilerThread(
10571057
() -> {
10581058
if (options.shouldOptimize()) {
1059-
performTranspilationAndOptimizations();
1059+
performTranspilationAndOptimizations(OptimizationPasses.ALL);
10601060
}
10611061
return null;
10621062
});
@@ -3001,11 +3001,11 @@ boolean endsWith(String suffix) {
30013001
// Optimizations
30023002
// ------------------------------------------------------------------------
30033003

3004-
void performTranspilationAndOptimizations() {
3004+
void performTranspilationAndOptimizations(OptimizationPasses optimizationPasses) {
30053005
checkState(options.shouldOptimize());
30063006
// getOptimizations() also includes transpilation passes
30073007
ImmutableList<PassFactory> optimizations =
3008-
getPassConfig().getOptimizations(OptimizationPasses.ALL).build();
3008+
getPassConfig().getOptimizations(optimizationPasses).build();
30093009
if (optimizations.isEmpty()) {
30103010
return;
30113011
}

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

+14-13
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.google.debugging.sourcemap.proto.Mapping.OriginalMapping.Precision;
4141
import com.google.javascript.jscomp.Compiler.ScriptNodeLicensesOnlyTracker;
4242
import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
43+
import com.google.javascript.jscomp.PassConfig.OptimizationPasses;
4344
import com.google.javascript.jscomp.deps.ModuleLoader.ResolutionMode;
4445
import com.google.javascript.jscomp.serialization.AstNode;
4546
import com.google.javascript.jscomp.serialization.LazyAst;
@@ -1294,7 +1295,7 @@ public void testCheckSaveRestoreOptimize() throws Exception {
12941295
compiler.init(externs, code, options);
12951296
restoreCompilerState(compiler, stateAfterChecks);
12961297

1297-
compiler.performTranspilationAndOptimizations();
1298+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
12981299
String source = compiler.toSource();
12991300
assertThat(source).isEqualTo("console.log(2);");
13001301
}
@@ -1353,7 +1354,7 @@ public void testCheckSaveRestore3Stages() throws Exception {
13531354
compiler.init(externs, srcs, options);
13541355
restoreCompilerState(compiler, stateAfterChecks);
13551356

1356-
compiler.performTranspilationAndOptimizations();
1357+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
13571358
String source = compiler.toSource();
13581359
assertThat(source)
13591360
.isEqualTo(
@@ -1450,7 +1451,7 @@ public void testCheckSaveRestore3StagesSourceMaps() throws Exception {
14501451
compiler = new Compiler(new TestErrorManager());
14511452
compiler.init(externs, srcs, options);
14521453
restoreCompilerState(compiler, stateAfterChecks);
1453-
compiler.performTranspilationAndOptimizations();
1454+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
14541455

14551456
String source = compiler.toSource();
14561457
assertThat(source).isEqualTo("console.log(new function(){}(1));");
@@ -1530,7 +1531,7 @@ public void testSingleStageCompileSourceMaps() throws Exception {
15301531

15311532
compiler.parse();
15321533
compiler.check();
1533-
compiler.performTranspilationAndOptimizations();
1534+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
15341535
compiler.performFinalizations();
15351536

15361537
final Result result = compiler.getResult();
@@ -1702,7 +1703,7 @@ public void testStrictnessWithNonStrictInputLanguageAndNoTranspileOutput() {
17021703

17031704
compiler.parse();
17041705
compiler.check();
1705-
compiler.performTranspilationAndOptimizations();
1706+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
17061707

17071708
String source = compiler.toSource();
17081709
assertThat(source).isEqualTo("console.log(0);");
@@ -1724,7 +1725,7 @@ public void testStrictnessWithStrictInputLanguageAndNoTranspileOutput() {
17241725

17251726
compiler.parse();
17261727
compiler.check();
1727-
compiler.performTranspilationAndOptimizations();
1728+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
17281729

17291730
String source = compiler.toSource();
17301731
assertThat(source).isEqualTo("'use strict';console.log(0);");
@@ -2538,7 +2539,7 @@ public void testWeakSources() throws Exception {
25382539

25392540
compiler.parse();
25402541
compiler.check();
2541-
compiler.performTranspilationAndOptimizations();
2542+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
25422543

25432544
assertThat(compiler.getChunkGraph().getChunkCount()).isEqualTo(2);
25442545
assertThat(Iterables.get(compiler.getChunkGraph().getAllChunks(), 0).getName())
@@ -2584,7 +2585,7 @@ private void weakSourcesModulesHelper(boolean saveAndRestore) throws Exception {
25842585
m2 = compiler.getChunkGraph().getChunkByName("m2");
25852586
}
25862587

2587-
compiler.performTranspilationAndOptimizations();
2588+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
25882589

25892590
assertThat(compiler.getChunkGraph().getChunkCount()).isEqualTo(3);
25902591

@@ -2641,7 +2642,7 @@ public void testWeakSourcesEntryPoint() throws Exception {
26412642

26422643
compiler.parse();
26432644
compiler.check();
2644-
compiler.performTranspilationAndOptimizations();
2645+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
26452646
compiler.performFinalizations();
26462647

26472648
assertThat(compiler.toSource())
@@ -2666,7 +2667,7 @@ public void testPreexistingWeakModule() throws Exception {
26662667

26672668
compiler.parse();
26682669
compiler.check();
2669-
compiler.performTranspilationAndOptimizations();
2670+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
26702671

26712672
assertThat(compiler.getChunkGraph().getChunkCount()).isEqualTo(2);
26722673
assertThat(Iterables.get(compiler.getChunkGraph().getAllChunks(), 0).getName()).isEqualTo("m");
@@ -2773,7 +2774,7 @@ public void testImplicitWeakSourcesWithEntryPoint() throws Exception {
27732774

27742775
compiler.parse();
27752776
compiler.check();
2776-
compiler.performTranspilationAndOptimizations();
2777+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
27772778
compiler.performFinalizations();
27782779

27792780
assertThat(compiler.toSource())
@@ -2808,7 +2809,7 @@ public void testImplicitWeakSourcesWithEntryPointLegacyPrune() throws Exception
28082809

28092810
compiler.parse();
28102811
compiler.check();
2811-
compiler.performTranspilationAndOptimizations();
2812+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
28122813
compiler.performFinalizations();
28132814

28142815
assertThat(compiler.toSource()).isEqualTo("function f(x){alert(x)};");
@@ -2853,7 +2854,7 @@ public void testTransitiveImplicitWeakSourcesWithEntryPoint() throws Exception {
28532854

28542855
compiler.parse();
28552856
compiler.check();
2856-
compiler.performTranspilationAndOptimizations();
2857+
compiler.performTranspilationAndOptimizations(OptimizationPasses.ALL);
28572858
compiler.performFinalizations();
28582859

28592860
assertThat(compiler.getWarnings()).isEmpty();

0 commit comments

Comments
 (0)