Class merging only when optimizing aggressively

Guardsquare · Feb 3, 2023 · 12516ba · 12516ba
1 parent 98309c9
commit 12516ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/base/src/main/java/proguard/optimize/Optimizer.java b/base/src/main/java/proguard/optimize/Optimizer.java
@@ -358,9 +358,9 @@ public void execute(AppView appView) throws IOException
         libraryGson                       = filter.matches(LIBRARY_GSON);
         classMarkingFinal                 = filter.matches(CLASS_MARKING_FINAL);
         classUnboxingEnum                 = filter.matches(CLASS_UNBOXING_ENUM);
-        classMergingVertical              = filter.matches(CLASS_MERGING_VERTICAL);
-        classMergingHorizontal            = filter.matches(CLASS_MERGING_HORIZONTAL);
-        classMergingWrapper               = filter.matches(CLASS_MERGING_WRAPPER);
+        classMergingVertical              = !configuration.optimizeConservatively && filter.matches(CLASS_MERGING_VERTICAL);
+        classMergingHorizontal            = !configuration.optimizeConservatively && filter.matches(CLASS_MERGING_HORIZONTAL);
+        classMergingWrapper               = !configuration.optimizeConservatively && filter.matches(CLASS_MERGING_WRAPPER);
         fieldRemovalWriteonly             = filter.matches(FIELD_REMOVAL_WRITEONLY);
         fieldMarkingPrivate               = filter.matches(FIELD_MARKING_PRIVATE);
         fieldGeneralizationClass          = filter.matches(FIELD_GENERALIZATION_CLASS);

diff --git a/docs/md/manual/configuration/optimizations.md b/docs/md/manual/configuration/optimizations.md
@@ -177,7 +177,7 @@ that such an instruction can have a side effect. If this instruction is removed
 during optimization, the code will thus behave differently under specific
 circumstances. By default, such instructions are always preserved. Setting this
 option will lead to these instructions being candidates for removal during
-optimization.
+optimization. Additionally, class merging is only enabled when this option is set.
 
 ## Gson optimization {: #gson}
 

diff --git a/docs/md/manual/configuration/usage.md b/docs/md/manual/configuration/usage.md
@@ -342,7 +342,7 @@ This page lists all available options for ProGuard, grouped logically.
   during optimization, the code will thus behave differently under specific
   circumstances. By default, such instructions are always preserved. Setting this
   option will lead to these instructions being candidates for removal during
-  optimization.
+  optimization. Additionally, class merging is only enabled when this option is set.
 
 ## Obfuscation Options {: #obfuscationoptions}
 

diff --git a/docs/md/manual/releasenotes.md b/docs/md/manual/releasenotes.md
@@ -1,3 +1,9 @@
+## Version 7.3.2
+
+### Improved
+
+- Merge classes only when `-optimizeaggressively` is set.
+
 ## Version 7.3.1
 
 ### Kotlin support