Removes deprecated aggressiveOptimizations flag.
Change-Id: Ide3cb914c74e391425573d7e8db667dfaf5a628c
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
index 2a6859b..217113a 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
@@ -188,12 +188,6 @@
}
@Override
- @Deprecated
- public boolean isAggressivelyOptimize() {
- return false;
- }
-
- @Override
public boolean isCastCheckingDisabled() {
return false;
}
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java
index e9f5c14..312881a 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java
@@ -46,12 +46,6 @@
}
@Override
- @Deprecated
- public final void setAggressivelyOptimize(boolean aggressivelyOptimize) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public final void setCastCheckingDisabled(boolean disabled) {
throw new UnsupportedOperationException();
}
diff --git a/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java b/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java
index e196f6b..0e2dc622 100644
--- a/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java
+++ b/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java
@@ -18,7 +18,6 @@
import com.google.gwt.dev.util.arg.ArgHandlerCompileReport;
import com.google.gwt.dev.util.arg.ArgHandlerCompilerMetrics;
-import com.google.gwt.dev.util.arg.ArgHandlerDisableAggressiveOptimization;
import com.google.gwt.dev.util.arg.ArgHandlerDisableCastChecking;
import com.google.gwt.dev.util.arg.ArgHandlerDisableClassMetadata;
import com.google.gwt.dev.util.arg.ArgHandlerDisableClusterSimilarFunctions;
@@ -59,7 +58,6 @@
super(options);
registerHandler(new ArgHandlerCompileReport(options));
registerHandler(new ArgHandlerCompilerMetrics(options));
- registerHandler(new ArgHandlerDisableAggressiveOptimization(options));
registerHandler(new ArgHandlerDisableCastChecking(options));
registerHandler(new ArgHandlerDisableClassMetadata(options));
registerHandler(new ArgHandlerDisableClusterSimilarFunctions(options));
diff --git a/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java b/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java
index 1e1c75d..c73a08c 100644
--- a/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java
+++ b/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java
@@ -146,12 +146,6 @@
}
@Override
- @Deprecated
- public boolean isAggressivelyOptimize() {
- return jjsOptions.isAggressivelyOptimize();
- }
-
- @Override
public boolean isCastCheckingDisabled() {
return jjsOptions.isCastCheckingDisabled();
}
@@ -236,12 +230,6 @@
}
@Override
- @Deprecated
- public void setAggressivelyOptimize(boolean aggressivelyOptimize) {
- jjsOptions.setAggressivelyOptimize(aggressivelyOptimize);
- }
-
- @Override
public void setCastCheckingDisabled(boolean disabled) {
jjsOptions.setCastCheckingDisabled(disabled);
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
index f5e1d5e..7b96592 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs;
-import com.google.gwt.dev.util.arg.OptionAggressivelyOptimize;
import com.google.gwt.dev.util.arg.OptionAllowJDTConstantInlining;
import com.google.gwt.dev.util.arg.OptionCheckedMode;
import com.google.gwt.dev.util.arg.OptionClusterSimilarFunctions;
@@ -50,7 +49,7 @@
/**
* Controls options for the {@link JavaToJavaScriptCompiler}.
*/
-public interface JJSOptions extends OptionOptimize, OptionAggressivelyOptimize,
+public interface JJSOptions extends OptionOptimize,
OptionClusterSimilarFunctions, OptionIncrementalCompile, OptionDisableClassMetadata,
OptionDisableCastChecking, OptionEnableAssertions, OptionInlineLiteralParameters,
OptionOptimizeDataflow, OptionRunAsyncEnabled, OptionScriptStyle, OptionSoycEnabled,
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
index 1a163fb..236a215 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
@@ -29,7 +29,6 @@
public class JJSOptionsImpl implements JJSOptions, Serializable {
private boolean addRuntimeChecks = false;
- private boolean aggressivelyOptimize = true;
private boolean closureCompilerEnabled;
private boolean clusterSimilarFunctions = true;
private boolean incrementalCompile = false;
@@ -70,7 +69,6 @@
public void copyFrom(JJSOptions other) {
setAddRuntimeChecks(other.shouldAddRuntimeChecks());
- setAggressivelyOptimize(other.isAggressivelyOptimize());
setCastCheckingDisabled(other.isCastCheckingDisabled());
setClassMetadataDisabled(other.isClassMetadataDisabled());
setClosureCompilerEnabled(other.isClosureCompilerEnabled());
@@ -146,12 +144,6 @@
}
@Override
- @Deprecated
- public boolean isAggressivelyOptimize() {
- return aggressivelyOptimize;
- }
-
- @Override
public boolean isCastCheckingDisabled() {
return disableCastChecking;
}
@@ -221,12 +213,6 @@
}
@Override
- @Deprecated
- public void setAggressivelyOptimize(boolean enabled) {
- aggressivelyOptimize = enabled;
- }
-
- @Override
public void setCastCheckingDisabled(boolean disabled) {
disableCastChecking = disabled;
}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDisableAggressiveOptimization.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDisableAggressiveOptimization.java
deleted file mode 100644
index ef2eaf1..0000000
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDisableAggressiveOptimization.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2007 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.dev.util.arg;
-
-import com.google.gwt.util.tools.ArgHandlerFlag;
-
-/**
- * Enables several aggressive optimization options.<br />
- *
- * Has been deprecated but preserved for backwards compatibility. The impact it has now is via its
- * cascaded modification of five more specific options (each of which is also modifiable via flag).
- */
-@Deprecated
-public final class ArgHandlerDisableAggressiveOptimization extends ArgHandlerFlag {
-
- private final OptionAggressivelyOptimize aggressivelyOptimizeOption;
- private final OptionClusterSimilarFunctions clusterSimilarFunctionsOption;
- private final OptionInlineLiteralParameters inlineLiteralParametersOption;
- private final OptionOptimizeDataflow optimizeDataflowOption;
- private final OptionOrdinalizeEnums ordinalizeEnumsOption;
- private final OptionRemoveDuplicateFunctions removeDuplicateFunctionsOption;
-
- public <
- T extends OptionAggressivelyOptimize & OptionClusterSimilarFunctions &
- OptionInlineLiteralParameters & OptionOptimizeDataflow &
- OptionOrdinalizeEnums & OptionRemoveDuplicateFunctions>
- ArgHandlerDisableAggressiveOptimization(T option) {
- this.aggressivelyOptimizeOption = option;
- this.clusterSimilarFunctionsOption = option;
- this.inlineLiteralParametersOption = option;
- this.optimizeDataflowOption = option;
- this.ordinalizeEnumsOption = option;
- this.removeDuplicateFunctionsOption = option;
-
- addTagValue("-XdisableAggressiveOptimization", false);
- }
-
- @Override
- public String getPurposeSnippet() {
- return "DEPRECATED: Tells the Production Mode compiler to perform "
- + "aggressive optimizations.";
- }
-
- @Override
- public String getLabel() {
- return "aggressiveOptimizations";
- }
-
- @Override
- public boolean isUndocumented() {
- return true;
- }
-
- @Override
- public boolean setFlag(boolean value) {
- aggressivelyOptimizeOption.setAggressivelyOptimize(value);
- clusterSimilarFunctionsOption.setClusterSimilarFunctions(value);
- inlineLiteralParametersOption.setInlineLiteralParameters(value);
- optimizeDataflowOption.setOptimizeDataflow(value);
- ordinalizeEnumsOption.setOrdinalizeEnums(value);
- removeDuplicateFunctionsOption.setRemoveDuplicateFunctions(value);
-
- return true;
- }
-
- @Override
- public boolean isExperimental() {
- return true;
- }
-
- @Override
- public boolean getDefaultValue() {
- return aggressivelyOptimizeOption.isAggressivelyOptimize();
- }
-}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDraftCompile.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDraftCompile.java
index fbd0d52..6b31541 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDraftCompile.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDraftCompile.java
@@ -23,7 +23,6 @@
*/
public class ArgHandlerDraftCompile extends ArgHandlerFlag {
- private final OptionAggressivelyOptimize aggressivelyOptimizeOption;
private final OptionOptimize optimizeOption;
private final OptionClusterSimilarFunctions clusterSimilarFunctionsOption;
private final OptionInlineLiteralParameters inlineLiteralParametersOption;
@@ -35,11 +34,9 @@
public <
T extends OptionOptimize & OptionClusterSimilarFunctions &
OptionInlineLiteralParameters & OptionOptimizeDataflow &
- OptionAggressivelyOptimize & OptionOrdinalizeEnums &
- OptionRemoveDuplicateFunctions & OptionNamespace>
+ OptionOrdinalizeEnums & OptionRemoveDuplicateFunctions & OptionNamespace>
ArgHandlerDraftCompile(T option) {
this.optimizeOption = option;
- this.aggressivelyOptimizeOption = option;
this.clusterSimilarFunctionsOption = option;
this.inlineLiteralParametersOption = option;
this.namespaceOption = option;
@@ -64,7 +61,6 @@
value ? OptionOptimize.OPTIMIZE_LEVEL_DRAFT : OptionOptimize.OPTIMIZE_LEVEL_DEFAULT;
optimizeOption.setOptimizationLevel(optimizeLevel);
- aggressivelyOptimizeOption.setAggressivelyOptimize(!value);
clusterSimilarFunctionsOption.setClusterSimilarFunctions(!value);
inlineLiteralParametersOption.setInlineLiteralParameters(!value);
namespaceOption.setNamespace(JsNamespaceOption.PACKAGE);
@@ -77,7 +73,6 @@
@Override
public boolean getDefaultValue() {
- return optimizeOption.getOptimizationLevel() == OptionOptimize.OPTIMIZE_LEVEL_DRAFT
- && !aggressivelyOptimizeOption.isAggressivelyOptimize();
+ return optimizeOption.getOptimizationLevel() == OptionOptimize.OPTIMIZE_LEVEL_DRAFT;
}
}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/OptionAggressivelyOptimize.java b/dev/core/src/com/google/gwt/dev/util/arg/OptionAggressivelyOptimize.java
deleted file mode 100644
index cc7540d..0000000
--- a/dev/core/src/com/google/gwt/dev/util/arg/OptionAggressivelyOptimize.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.dev.util.arg;
-
-/**
- * Option to determine whether the compiler should aggressively optimize.
- */
-@Deprecated
-public interface OptionAggressivelyOptimize {
-
- /**
- * Returns true if the compiler should aggressively optimize.
- */
- boolean isAggressivelyOptimize();
-
- /**
- * Sets whether or not the compiler should aggressively optimize.
- */
- void setAggressivelyOptimize(boolean enabled);
-}
diff --git a/dev/core/test/com/google/gwt/dev/CompilerTest.java b/dev/core/test/com/google/gwt/dev/CompilerTest.java
index 13616b5..6ce54ac 100644
--- a/dev/core/test/com/google/gwt/dev/CompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/CompilerTest.java
@@ -735,7 +735,7 @@
public void testAllValidArgs() {
assertProcessSuccess(argProcessor, new String[] {"-logLevel", "DEBUG", "-style",
- "PRETTY", "-ea", "-XdisableAggressiveOptimization", "-gen", "myGen",
+ "PRETTY", "-ea", "-gen", "myGen",
"-war", "myWar", "-workDir", "myWork", "-extra", "myExtra", "-incremental",
"-localWorkers", "2", "-sourceLevel", "1.7", "c.g.g.h.H", "my.Module"});
@@ -750,11 +750,11 @@
assertEquals(TreeLogger.DEBUG, options.getLogLevel());
assertEquals(JsOutputOption.PRETTY, options.getOutput());
assertTrue(options.isEnableAssertions());
- assertFalse(options.shouldClusterSimilarFunctions());
- assertFalse(options.shouldInlineLiteralParameters());
- assertFalse(options.shouldOptimizeDataflow());
- assertFalse(options.shouldOrdinalizeEnums());
- assertFalse(options.shouldRemoveDuplicateFunctions());
+ assertTrue(options.shouldClusterSimilarFunctions());
+ assertTrue(options.shouldInlineLiteralParameters());
+ assertTrue(options.shouldOptimizeDataflow());
+ assertTrue(options.shouldOrdinalizeEnums());
+ assertTrue(options.shouldRemoveDuplicateFunctions());
assertTrue(options.isIncrementalCompileEnabled());
assertEquals(SourceLevel.JAVA7, options.getSourceLevel());
diff --git a/dev/core/test/com/google/gwt/dev/PrecompileTaskArgProcessorTest.java b/dev/core/test/com/google/gwt/dev/PrecompileTaskArgProcessorTest.java
index 084445b..123239f 100644
--- a/dev/core/test/com/google/gwt/dev/PrecompileTaskArgProcessorTest.java
+++ b/dev/core/test/com/google/gwt/dev/PrecompileTaskArgProcessorTest.java
@@ -72,18 +72,6 @@
assertNotEquals(defaultOptions.isStrict(), handledOptions.isStrict());
}
- @SuppressWarnings("deprecation")
- public void testFlagBackwardCompatibility_aggressiveOptimizations() {
- // Set aggressiveOptimizations using the old-style tag.
- precompileTaskArgProcessor.processArgs(
- "-workDir", "/tmp", "-XdisableAggressiveOptimization", "com.google.gwt.dev.DevModule");
-
- // Show that the flags were recognized and ended up modifying options.
- assertNotEquals(
- defaultOptions.isAggressivelyOptimize(), handledOptions.isAggressivelyOptimize());
- }
-
- @SuppressWarnings("deprecation")
public void testFlagBackwardCompatibility_draftCompile() {
// Set draftCompile using the old-style tag.
precompileTaskArgProcessor.processArgs(
@@ -91,7 +79,5 @@
// Show that the flags were recognized and ended up modifying options.
assertTrue(defaultOptions.getOptimizationLevel() != handledOptions.getOptimizationLevel());
- assertNotEquals(
- defaultOptions.isAggressivelyOptimize(), handledOptions.isAggressivelyOptimize());
}
}
diff --git a/user/src/com/google/gwt/junit/JUnitShell.java b/user/src/com/google/gwt/junit/JUnitShell.java
index 613feea..fc6e414 100644
--- a/user/src/com/google/gwt/junit/JUnitShell.java
+++ b/user/src/com/google/gwt/junit/JUnitShell.java
@@ -39,7 +39,6 @@
import com.google.gwt.dev.shell.CheckForUpdates;
import com.google.gwt.dev.shell.jetty.JettyLauncher;
import com.google.gwt.dev.util.arg.ArgHandlerDeployDir;
-import com.google.gwt.dev.util.arg.ArgHandlerDisableAggressiveOptimization;
import com.google.gwt.dev.util.arg.ArgHandlerDisableCastChecking;
import com.google.gwt.dev.util.arg.ArgHandlerDisableClassMetadata;
import com.google.gwt.dev.util.arg.ArgHandlerDisableClusterSimilarFunctions;
@@ -273,7 +272,6 @@
*/
registerHandler(new ArgHandlerScriptStyle(options));
registerHandler(new ArgHandlerEnableAssertions(options));
- registerHandler(new ArgHandlerDisableAggressiveOptimization(options));
registerHandler(new ArgHandlerDisableCastChecking(options));
registerHandler(new ArgHandlerDisableClassMetadata(options));
registerHandler(new ArgHandlerDisableClusterSimilarFunctions(options));
