Skip to content

Commit 3f72162

Browse files
concavelenzcopybara-github
authored andcommitted
Rename removeDeadCode to removeUnreachableCode.
"dead code" is extremely ambiguous where as "unreachable" is more often used when talking about CFG code removals. PiperOrigin-RevId: 609196804
1 parent a6620f3 commit 3f72162

File tree

6 files changed

+29
-21
lines changed

6 files changed

+29
-21
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private static void applySafeCompilationOptions(CompilerOptions options) {
130130
options.setCollapseVariableDeclarations(true);
131131
options.convertToDottedProperties = true;
132132
options.labelRenaming = true;
133-
options.setRemoveDeadCode(true);
133+
options.setRemoveUnreachableCode(true);
134134
options.setOptimizeArgumentsArray(true);
135135
options.setRemoveUnusedVariables(Reach.LOCAL_ONLY);
136136
options.collapseObjectLiterals = true;
@@ -161,7 +161,7 @@ private static void applyFullCompilationOptions(CompilerOptions options) {
161161
options.setCollapseVariableDeclarations(true);
162162
options.setConvertToDottedProperties(true);
163163
options.setLabelRenaming(true);
164-
options.setRemoveDeadCode(true);
164+
options.setRemoveUnreachableCode(true);
165165
options.setOptimizeArgumentsArray(true);
166166
options.setCollapseObjectLiterals(true);
167167
options.setProtectHiddenSideEffects(true);

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

+13-5
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ public void setNumParallelThreads(int parallelism) {
453453
public boolean smartNameRemoval;
454454

455455
/** Removes code that will never execute */
456-
public boolean removeDeadCode;
456+
public boolean removeUnreachableCode;
457457

458458
public enum ExtractPrototypeMemberDeclarationsMode {
459459
OFF,
@@ -1306,7 +1306,7 @@ public CompilerOptions() {
13061306
inlineVariables = false;
13071307
inlineLocalVariables = false;
13081308
smartNameRemoval = false;
1309-
removeDeadCode = false;
1309+
removeUnreachableCode = false;
13101310
extractPrototypeMemberDeclarations = ExtractPrototypeMemberDeclarationsMode.OFF;
13111311
removeUnusedPrototypeProperties = false;
13121312
removeUnusedClassProperties = false;
@@ -2092,8 +2092,16 @@ public void setSmartNameRemoval(boolean smartNameRemoval) {
20922092
}
20932093
}
20942094

2095-
public void setRemoveDeadCode(boolean removeDeadCode) {
2096-
this.removeDeadCode = removeDeadCode;
2095+
/**
2096+
* @deprecated Use {@link #setRemoveUnreachableCode} instead.
2097+
*/
2098+
@Deprecated
2099+
public void setRemoveDeadCode(boolean removeUnreachableCode) {
2100+
setRemoveUnreachableCode(removeUnreachableCode);
2101+
}
2102+
2103+
public void setRemoveUnreachableCode(boolean removeUnreachableCode) {
2104+
this.removeUnreachableCode = removeUnreachableCode;
20972105
}
20982106

20992107
public void setExtractPrototypeMemberDeclarations(boolean enabled) {
@@ -2889,8 +2897,8 @@ public String toString() {
28892897
.add("quoteKeywordProperties", quoteKeywordProperties)
28902898
.add("removeAbstractMethods", removeAbstractMethods)
28912899
.add("removeClosureAsserts", removeClosureAsserts)
2892-
.add("removeDeadCode", removeDeadCode)
28932900
.add("removeJ2clAsserts", removeJ2clAsserts)
2901+
.add("removeUnreachableCode", removeUnreachableCode)
28942902
.add("removeUnusedClassProperties", removeUnusedClassProperties)
28952903
.add("removeUnusedConstructorProperties", removeUnusedConstructorProperties)
28962904
.add("removeUnusedLocalVars", removeUnusedLocalVars)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ private PassListBuilder getEarlyOptimizationLoopPasses() {
993993
earlyLoopPasses.maybeAdd(peepholeOptimizations);
994994
}
995995

996-
if (options.removeDeadCode) {
996+
if (options.removeUnreachableCode) {
997997
earlyLoopPasses.maybeAdd(removeUnreachableCode);
998998
}
999999

@@ -1068,7 +1068,7 @@ private PassListBuilder getPostL10nOptimizations() {
10681068
loopPasses.maybeAdd(peepholeOptimizations);
10691069
}
10701070

1071-
if (options.removeDeadCode) {
1071+
if (options.removeUnreachableCode) {
10721072
loopPasses.maybeAdd(removeUnreachableCode);
10731073
}
10741074
loopPasses.assertAllLoopablePasses();
@@ -1137,7 +1137,7 @@ private PassListBuilder getMainOptimizationLoop() {
11371137
passes.maybeAdd(peepholeOptimizations);
11381138
}
11391139

1140-
if (options.removeDeadCode) {
1140+
if (options.removeUnreachableCode) {
11411141
passes.maybeAdd(removeUnreachableCode);
11421142
}
11431143

src/com/google/javascript/jscomp/debugger/common/CompilationParam.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -693,12 +693,12 @@ public String getJavaInfo() {
693693
REMOVE_DEAD_CODE(ParamGroup.OPTIMIZATION) {
694694
@Override
695695
public void apply(CompilerOptions options, boolean value) {
696-
options.setRemoveDeadCode(value);
696+
options.setRemoveUnreachableCode(value);
697697
}
698698

699699
@Override
700700
public boolean isApplied(CompilerOptions options) {
701-
return options.removeDeadCode;
701+
return options.removeUnreachableCode;
702702
}
703703
},
704704

test/com/google/javascript/jscomp/integration/IntegrationTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ public void testIssue90() {
401401
CompilerOptions options = createCompilerOptions();
402402
options.setFoldConstants(true);
403403
options.setInlineVariables(true);
404-
options.setRemoveDeadCode(true);
404+
options.setRemoveUnreachableCode(true);
405405
test(options, "var x; x && alert(1);", "");
406406
}
407407

@@ -1476,7 +1476,7 @@ public void testDisambiguateProperties2() {
14761476
options.setClosurePass(true);
14771477
options.setCheckTypes(true);
14781478
options.setDisambiguateProperties(true);
1479-
options.setRemoveDeadCode(true);
1479+
options.setRemoveUnreachableCode(true);
14801480
options.setRemoveAbstractMethods(true);
14811481
test(
14821482
options,
@@ -1504,7 +1504,7 @@ public void testDisambiguatePropertiesWithPropertyInvalidationError() {
15041504
options.setCheckTypes(true);
15051505
options.setDisambiguateProperties(true);
15061506
options.setPropertiesThatMustDisambiguate(ImmutableSet.of("a"));
1507-
options.setRemoveDeadCode(true);
1507+
options.setRemoveUnreachableCode(true);
15081508
options.setRemoveAbstractMethods(true);
15091509
test(
15101510
options,
@@ -1531,7 +1531,7 @@ public void testDisambiguatePropertiesWithPropertyInvalidationError() {
15311531
public void testMarkPureCalls() {
15321532
String testCode = "function foo() {} foo();";
15331533
CompilerOptions options = createCompilerOptions();
1534-
options.setRemoveDeadCode(true);
1534+
options.setRemoveUnreachableCode(true);
15351535

15361536
testSame(options, testCode);
15371537

@@ -1748,7 +1748,7 @@ public void testRemoveUnreachableCode() {
17481748
String code = "function f() { return; f(); }";
17491749
testSame(options, code);
17501750

1751-
options.setRemoveDeadCode(true);
1751+
options.setRemoveUnreachableCode(true);
17521752
test(options, code, "function f() {}");
17531753
}
17541754

@@ -1784,7 +1784,7 @@ public void testSmartNamePassBug11163486() {
17841784

17851785
options.setCheckTypes(true);
17861786
options.setDisambiguateProperties(true);
1787-
options.setRemoveDeadCode(true);
1787+
options.setRemoveUnreachableCode(true);
17881788
options.setRemoveUnusedVariables(Reach.ALL);
17891789
options.setRemoveUnusedPrototypeProperties(true);
17901790
options.setSmartNameRemoval(true);
@@ -1832,7 +1832,7 @@ public void testDeadCodeHasNoDisambiguationSideEffects() {
18321832

18331833
options.setCheckTypes(true);
18341834
options.setDisambiguateProperties(true);
1835-
options.setRemoveDeadCode(true);
1835+
options.setRemoveUnreachableCode(true);
18361836
options.setRemoveUnusedVariables(Reach.ALL);
18371837
options.setRemoveUnusedPrototypeProperties(true);
18381838
options.setSmartNameRemoval(true);
@@ -4804,7 +4804,7 @@ public void testDeclareLegacyNamespaceSubModuleCrash() {
48044804
CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
48054805
options.setLanguageOut(LanguageMode.ECMASCRIPT_2016);
48064806

4807-
options.setRemoveDeadCode(false);
4807+
options.setRemoveUnreachableCode(false);
48084808
options.setRemoveUnusedVariables(Reach.NONE);
48094809
options.setRemoveUnusedClassProperties(false);
48104810

test/com/google/javascript/jscomp/integration/PolymerIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ public void testPolymerExportPolicyExportAllLegacyElement() {
780780
options.setRenamingPolicy(VariableRenamingPolicy.ALL, PropertyRenamingPolicy.ALL_UNQUOTED);
781781
options.setRemoveUnusedPrototypeProperties(true);
782782
options.setRemoveUnusedVariables(Reach.ALL);
783-
options.setRemoveDeadCode(true);
783+
options.setRemoveUnreachableCode(true);
784784
options.setPolymerExportPolicy(PolymerExportPolicy.EXPORT_ALL);
785785
options.setGenerateExports(true);
786786
options.setExportLocalPropertyDefinitions(true);

0 commit comments

Comments
 (0)