Remove Log class
Bug: b/270021542
Change-Id: Ic5a4cab68185be470d6ae88b7f3c206a8959b5df
diff --git a/src/main/java/com/android/tools/r8/dex/DexParser.java b/src/main/java/com/android/tools/r8/dex/DexParser.java
index e23386b..056d075 100644
--- a/src/main/java/com/android/tools/r8/dex/DexParser.java
+++ b/src/main/java/com/android/tools/r8/dex/DexParser.java
@@ -461,9 +461,6 @@
}
private DexAnnotation parseAnnotation() {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Reading Annotation @ 0x%08x.", dexReader.position());
- }
int visibility = dexReader.get();
return new DexAnnotation(visibility, parseEncodedAnnotation());
}
@@ -473,9 +470,6 @@
}
private DexAnnotationSet parseAnnotationSet() {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Reading AnnotationSet @ 0x%08x.", dexReader.position());
- }
int size = dexReader.getUint();
int[] annotationOffsets = new int[size];
for (int i = 0; i < size; i++) {
@@ -802,9 +796,6 @@
int[] staticValuesOffsets = new int[length];
for (int i = 0; i < length; i++) {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Reading ClassDef @ 0x%08x.", dexReader.position());
- }
classIndices[i] = dexReader.getUint();
accessFlags[i] = dexReader.getUint();
superclassIndices[i] = dexReader.getInt();
@@ -955,19 +946,6 @@
}
result[i] = new DexSection(type, unused, size, offset);
}
- if (Log.ENABLED) {
- for (int i = 0; i < result.length; i++) {
- DexSection dexSection = result[i];
- int nextOffset = i < result.length - 1 ? result[i + 1].offset : dexSection.offset;
- Log.debug(
- this.getClass(),
- "Read section 0x%04x @ 0x%08x #items %08d size 0x%08x.",
- dexSection.type,
- dexSection.offset,
- dexSection.length,
- nextOffset - dexSection.offset);
- }
- }
for (int i = 0; i < mapSize - 1; i++) {
result[i].setEnd(result[i + 1].offset);
}
diff --git a/src/main/java/com/android/tools/r8/dex/FileWriter.java b/src/main/java/com/android/tools/r8/dex/FileWriter.java
index f36a045..fa49c7d 100644
--- a/src/main/java/com/android/tools/r8/dex/FileWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/FileWriter.java
@@ -145,9 +145,6 @@
public static void writeEncodedAnnotation(
DexEncodedAnnotation annotation, DexOutputBuffer dest, ObjectToOffsetMapping mapping) {
- if (Log.ENABLED) {
- Log.verbose(FileWriter.class, "Writing encoded annotation @ %08x", dest.position());
- }
List<DexAnnotationElement> elements = new ArrayList<>(Arrays.asList(annotation.elements));
elements.sort((a, b) -> a.name.acceptCompareTo(b.name, mapping.getCompareToVisitor()));
dest.putUleb128(mapping.getOffsetFor(annotation.type));
@@ -468,9 +465,6 @@
}
}
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Computed size item %08d.", result);
- }
return result;
}
@@ -607,18 +601,12 @@
private void writeAnnotation(DexAnnotation annotation) {
mixedSectionOffsets.setOffsetFor(annotation, dest.position());
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Writing Annotation @ 0x%08x.", dest.position());
- }
dest.putByte((byte) annotation.visibility);
writeEncodedAnnotation(annotation.annotation, dest, mapping);
}
private void writeAnnotationSet(DexAnnotationSet set) {
mixedSectionOffsets.setOffsetFor(set, dest.align(4));
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Writing AnnotationSet @ 0x%08x.", dest.position());
- }
List<DexAnnotation> annotations = new ArrayList<>(Arrays.asList(set.annotations));
annotations.sort(
(a, b) ->
@@ -771,9 +759,6 @@
private void writeEncodedArray(DexEncodedArray array) {
mixedSectionOffsets.setOffsetFor(array, dest.position());
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Writing EncodedArray @ 0x%08x [%s].", dest.position(), array);
- }
dest.putUleb128(array.values.length);
for (DexValue value : array.values) {
value.writeTo(dest, mapping);
@@ -914,9 +899,6 @@
if (length == 0) {
return 0;
}
- if (Log.ENABLED) {
- Log.debug(getClass(), "Map entry 0x%04x @ 0x%08x # %08d.", type, offset, length);
- }
dest.putShort((short) type);
dest.putShort((short) 0);
dest.putInt(length);
diff --git a/src/main/java/com/android/tools/r8/dex/VirtualFile.java b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
index 1b625f6..2165ba0 100644
--- a/src/main/java/com/android/tools/r8/dex/VirtualFile.java
+++ b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
@@ -408,14 +408,6 @@
}
mainDexFile.commitTransaction();
});
- if (Log.ENABLED) {
- Log.info(
- VirtualFile.class, "Main dex classes: " + mainDexFile.transaction.getNumberOfClasses());
- Log.info(
- VirtualFile.class, "Main dex methods: " + mainDexFile.transaction.getNumberOfMethods());
- Log.info(
- VirtualFile.class, "Main dex fields: " + mainDexFile.transaction.getNumberOfFields());
- }
mainDexFile.throwIfFull(true, options.reporter);
}
diff --git a/src/main/java/com/android/tools/r8/graph/ClasspathMethod.java b/src/main/java/com/android/tools/r8/graph/ClasspathMethod.java
index 3f796e3..f6b588d 100644
--- a/src/main/java/com/android/tools/r8/graph/ClasspathMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/ClasspathMethod.java
@@ -16,9 +16,6 @@
public void registerCodeReferencesForDesugaring(UseRegistry registry) {
Code code = getDefinition().getCode();
if (code != null) {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Registering definitions reachable from `%s`.", this);
- }
code.registerCodeReferencesForDesugaring(this, registry);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/ProgramMethod.java b/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
index 7980af2..f3e4f1e 100644
--- a/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
@@ -121,9 +121,6 @@
public void registerCodeReferences(UseRegistry<?> registry) {
Code code = getDefinition().getCode();
if (code != null) {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Registering definitions reachable from `%s`.", this);
- }
code.registerCodeReferences(this, registry);
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index d878ee0..ded5c65 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -388,13 +388,6 @@
new IRToDexFinalizer(appView, deadCodeRemover)
.finalizeCode(code, BytecodeMetadataProvider.empty(), timing),
appView);
- if (Log.ENABLED) {
- Log.debug(
- getClass(),
- "Resulting dex code for %s:\n%s",
- method.toSourceString(),
- logCode(options, definition));
- }
}
public void optimizeSynthesizedMethods(
@@ -514,13 +507,6 @@
options.reporter.info(
new StringDiagnostic("Processing: " + method.toSourceString()));
}
- if (Log.ENABLED) {
- Log.debug(
- getClass(),
- "Original code for %s:\n%s",
- method.toSourceString(),
- logCode(options, method.getDefinition()));
- }
if (options.testing.hookInIrConversion != null) {
options.testing.hookInIrConversion.run();
}
@@ -551,9 +537,6 @@
Timing timing = Timing.create(context.toSourceString(), options);
- if (Log.ENABLED) {
- Log.debug(getClass(), "Initial (SSA) flow graph for %s:\n%s", method.toSourceString(), code);
- }
// Compilation header if printing CFGs for this method.
printC1VisualizerHeader(method);
String previous = printMethod(code, "Initial IR (SSA)", null);
@@ -834,10 +817,6 @@
timing.end();
previous = printMethod(code, "IR after class initializer optimisation (SSA)", previous);
- if (Log.ENABLED) {
- Log.debug(getClass(), "Intermediate (SSA) flow graph for %s:\n%s",
- method.toSourceString(), code);
- }
// Dead code removal. Performed after simplifications to remove code that becomes dead
// as a result of those simplifications. The following optimizations could reveal more
// dead code which is removed right before register allocation in performRegisterAllocation.
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java b/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
index cf59a7e..03ab6ca 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
@@ -75,10 +75,6 @@
CodeRewriter.removeUnneededMovesOnExitingPaths(code, registerAllocator);
CodeRewriter.collapseTrivialGotos(appView, code);
timing.end();
- if (Log.ENABLED) {
- Log.debug(
- getClass(), "Final (non-SSA) flow graph for %s:\n%s", method.toSourceString(), code);
- }
return registerAllocator;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java b/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java
index c7b0ae3..aaa7481 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/PostMethodProcessor.java
@@ -169,9 +169,6 @@
while (!callGraph.isEmpty()) {
ProgramMethodSet wave = callGraph.extractLeaves();
waves.addLast(wave);
- if (Log.ENABLED && Log.isLoggingEnabledFor(PostMethodProcessor.class)) {
- Log.info(getClass(), "Wave #%d: %d", waveCount++, wave.size());
- }
}
return waves;
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryD8L8IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryD8L8IRConverter.java
index 9d03bb5..e674286 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryD8L8IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryD8L8IRConverter.java
@@ -375,13 +375,6 @@
MethodProcessor methodProcessor,
MethodProcessingContext methodProcessingContext) {
boolean didDesugar = desugar(method, desugaringEventConsumer, methodProcessingContext);
- if (Log.ENABLED && didDesugar) {
- Log.debug(
- getClass(),
- "Desugared code for %s:\n%s",
- method.toSourceString(),
- logCode(options, method.getDefinition()));
- }
return rewriteDesugaredCodeInternal(method, feedback, methodProcessor, methodProcessingContext);
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java
index 805067a..5580721 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryMethodProcessor.java
@@ -107,9 +107,6 @@
while (!nodes.isEmpty()) {
ProgramMethodSet wave = callGraph.extractLeaves();
waves.addLast(wave);
- if (Log.ENABLED && Log.isLoggingEnabledFor(PrimaryMethodProcessor.class)) {
- Log.info(getClass(), "Wave #%d: %d", waveCount++, wave.size());
- }
}
options.testing.waveModifier.accept(waves);
return waves;
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryR8IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryR8IRConverter.java
index 3b7fcef..408f18d 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/PrimaryR8IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/PrimaryR8IRConverter.java
@@ -14,7 +14,6 @@
import com.android.tools.r8.graph.PrunedItems;
import com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor;
import com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed;
-import com.android.tools.r8.logging.Log;
import com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
import com.android.tools.r8.utils.CfgPrinter;
@@ -219,18 +218,6 @@
identifierNameStringMarker.decoupleIdentifierNameStringsInFields(executorService);
}
- if (Log.ENABLED) {
- if (idempotentFunctionCallCanonicalizer != null) {
- idempotentFunctionCallCanonicalizer.logResults();
- }
- if (libraryMethodOverrideAnalysis != null) {
- libraryMethodOverrideAnalysis.logResults();
- }
- if (stringOptimizer != null) {
- stringOptimizer.logResult();
- }
- }
-
// Assure that no more optimization feedback left after post processing.
assert feedback.noUpdatesLeft();
return builder.build();
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/callgraph/CycleEliminator.java b/src/main/java/com/android/tools/r8/ir/conversion/callgraph/CycleEliminator.java
index c96def4..705270f 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/callgraph/CycleEliminator.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/callgraph/CycleEliminator.java
@@ -115,9 +115,6 @@
} while (!roots.isEmpty());
CycleEliminationResult result = new CycleEliminationResult(removedCallEdges);
- if (Log.ENABLED) {
- Log.info(getClass(), "# call graph cycles broken: %s", result.numberOfRemovedCallEdges());
- }
reset();
return result;
}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizer.java b/src/main/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizer.java
index 257af5e..f918051 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizer.java
@@ -61,34 +61,10 @@
private int numberOfLibraryCallCanonicalization = 0;
private int numberOfProgramCallCanonicalization = 0;
- private final Object2IntMap<Long> histogramOfCanonicalizationCandidatesPerMethod;
public IdempotentFunctionCallCanonicalizer(AppView<?> appView) {
this.appView = appView;
this.factory = appView.dexItemFactory();
- if (Log.ENABLED) {
- histogramOfCanonicalizationCandidatesPerMethod = new Object2IntArrayMap<>();
- } else {
- histogramOfCanonicalizationCandidatesPerMethod = null;
- }
- }
-
- public void logResults() {
- assert Log.ENABLED;
- Log.info(getClass(),
- "# invoke canonicalization (library): %s", numberOfLibraryCallCanonicalization);
- Log.info(getClass(),
- "# invoke canonicalization (program): %s", numberOfProgramCallCanonicalization);
- assert histogramOfCanonicalizationCandidatesPerMethod != null;
- Log.info(getClass(), "------ histogram of invoke canonicalization candidates ------");
- histogramOfCanonicalizationCandidatesPerMethod.forEach(
- (length, count) ->
- Log.info(
- getClass(),
- "%s: %s (%s)",
- length,
- StringUtils.times("*", Math.min(count, 53)),
- count));
}
public void canonicalize(IRCode code) {
@@ -203,13 +179,6 @@
Map<InvokeMethod, Value> deadInvocations = Maps.newHashMap();
FastSortedEntrySet<InvokeMethod, List<Value>> entries = returnValues.object2ObjectEntrySet();
- if (Log.ENABLED && Log.isLoggingEnabledFor(IdempotentFunctionCallCanonicalizer.class)) {
- Long numOfCandidates = entries.stream().filter(a -> a.getValue().size() > 1).count();
- synchronized (histogramOfCanonicalizationCandidatesPerMethod) {
- int count = histogramOfCanonicalizationCandidatesPerMethod.getOrDefault(numOfCandidates, 0);
- histogramOfCanonicalizationCandidatesPerMethod.put(numOfCandidates, count + 1);
- }
- }
entries.stream()
.filter(a -> a.getValue().size() > 1)
.sorted((a, b) -> Integer.compare(b.getValue().size(), a.getValue().size()))
@@ -217,14 +186,6 @@
.forEach(
(entry) -> {
InvokeMethod invoke = entry.getKey();
- if (Log.ENABLED) {
- if (factory.libraryMethodsWithReturnValueDependingOnlyOnArguments.contains(
- invoke.getInvokedMethod())) {
- numberOfLibraryCallCanonicalization += entry.getValue().size() - 1;
- } else {
- numberOfProgramCallCanonicalization += entry.getValue().size() - 1;
- }
- }
Value canonicalizedValue =
code.createValue(invoke.getOutType(), invoke.outValue().getLocalInfo());
Invoke canonicalizedInvoke =
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/string/StringOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/string/StringOptimizer.java
index 09c8163..373208d 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/string/StringOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/string/StringOptimizer.java
@@ -49,64 +49,9 @@
private final AppView<?> appView;
private final DexItemFactory factory;
- private int numberOfSimplifiedOperations = 0;
- private final Object2IntMap<ClassNameMapping> numberOfComputedNames;
- private final Object2IntMap<ClassNameMapping> numberOfDeferredComputationOfNames;
- private final Object2IntMap<Integer> histogramOfLengthOfNames;
- private final Object2IntMap<Integer> histogramOfLengthOfDeferredNames;
- private int numberOfSimplifiedConversions = 0;
-
public StringOptimizer(AppView<?> appView) {
this.appView = appView;
this.factory = appView.dexItemFactory();
- if (Log.ENABLED && Log.isLoggingEnabledFor(StringOptimizer.class)) {
- numberOfComputedNames = new Object2IntArrayMap<>();
- numberOfDeferredComputationOfNames = new Object2IntArrayMap<>();
- histogramOfLengthOfNames = new Object2IntArrayMap<>();
- histogramOfLengthOfDeferredNames = new Object2IntArrayMap<>();
- } else {
- numberOfComputedNames = null;
- numberOfDeferredComputationOfNames = null;
- histogramOfLengthOfNames = null;
- histogramOfLengthOfDeferredNames = null;
- }
- }
-
- public void logResult() {
- assert Log.ENABLED;
- Log.info(getClass(),
- "# trivial operations on const-string: %s", numberOfSimplifiedOperations);
- Log.info(getClass(),
- "# trivial conversions from/to const-string: %s", numberOfSimplifiedConversions);
- if (numberOfComputedNames != null) {
- Log.info(getClass(), "------ # of get*Name() computation ------");
- numberOfComputedNames.forEach((kind, count) -> {
- Log.info(getClass(),
- "%s: %s (%s)", kind, StringUtils.times("*", Math.min(count, 53)), count);
- });
- }
- if (numberOfDeferredComputationOfNames != null) {
- Log.info(getClass(), "------ # of deferred get*Name() computation ------");
- numberOfDeferredComputationOfNames.forEach((kind, count) -> {
- Log.info(getClass(),
- "%s: %s (%s)", kind, StringUtils.times("*", Math.min(count, 53)), count);
- });
- }
- if (histogramOfLengthOfNames != null) {
- Log.info(getClass(), "------ histogram of get*Name() result lengths ------");
- histogramOfLengthOfNames.forEach((length, count) -> {
- Log.info(getClass(),
- "%s: %s (%s)", length, StringUtils.times("*", Math.min(count, 53)), count);
- });
- }
- if (histogramOfLengthOfDeferredNames != null) {
- Log.info(getClass(),
- "------ histogram of original type length for deferred get*Name() ------");
- histogramOfLengthOfDeferredNames.forEach((length, count) -> {
- Log.info(getClass(),
- "%s: %s (%s)", length, StringUtils.times("*", Math.min(count, 53)), count);
- });
- }
}
// boolean String#isEmpty()
@@ -187,7 +132,6 @@
TypeElement.stringClassType(appView, definitelyNotNull()), invoke.getLocalInfo());
affectedValues.addAll(invoke.outValue().affectedValues());
it.replaceCurrentInstruction(new ConstString(stringValue, factory.createString(sub)));
- numberOfSimplifiedOperations++;
continue;
}
@@ -203,7 +147,6 @@
TypeElement.stringClassType(appView, definitelyNotNull()), invoke.getLocalInfo());
affectedValues.addAll(invoke.outValue().affectedValues());
it.replaceCurrentInstruction(new ConstString(newOutValue, resultString));
- numberOfSimplifiedOperations++;
continue;
}
@@ -287,7 +230,6 @@
constNumber = code.createIntConstant(v);
}
- numberOfSimplifiedOperations++;
it.replaceCurrentInstruction(constNumber);
}
// Computed substring is not null, and thus propagate that information.
@@ -379,10 +321,8 @@
deferred =
new DexItemBasedConstString(
invoke.outValue(), baseType, ClassNameComputationInfo.create(NAME, arrayDepth));
- logDeferredNameComputation(NAME);
} else {
name = NAME.map(descriptor, holder, factory, arrayDepth);
- logNameComputation(NAME);
}
} else if (invokedMethod == factory.classMethods.getTypeName) {
// TODO(b/119426668): desugar Type#getTypeName
@@ -405,10 +345,8 @@
invoke.outValue(),
baseType,
ClassNameComputationInfo.create(CANONICAL_NAME, arrayDepth));
- logDeferredNameComputation(CANONICAL_NAME);
} else {
name = CANONICAL_NAME.map(descriptor, holder, factory, arrayDepth);
- logNameComputation(CANONICAL_NAME);
}
}
} else if (invokedMethod == factory.classMethods.getSimpleName) {
@@ -427,10 +365,8 @@
invoke.outValue(),
baseType,
ClassNameComputationInfo.create(SIMPLE_NAME, arrayDepth));
- logDeferredNameComputation(SIMPLE_NAME);
} else {
name = SIMPLE_NAME.map(descriptor, holder, factory, arrayDepth);
- logNameComputation(SIMPLE_NAME);
}
}
}
@@ -441,11 +377,9 @@
TypeElement.stringClassType(appView, definitelyNotNull()), invoke.getLocalInfo());
ConstString constString = new ConstString(stringValue, name);
it.replaceCurrentInstruction(constString);
- logHistogramOfNames(name);
} else if (deferred != null) {
affectedValues.addAll(invoke.outValue().affectedValues());
it.replaceCurrentInstruction(deferred);
- logHistogramOfNames(deferred);
}
}
// Computed name is not null or literally null (for canonical name of local/anonymous class).
@@ -455,50 +389,6 @@
}
}
- private void logNameComputation(ClassNameMapping kind) {
- if (Log.ENABLED && Log.isLoggingEnabledFor(StringOptimizer.class)) {
- assert numberOfComputedNames != null;
- synchronized (numberOfComputedNames) {
- int count = numberOfComputedNames.getOrDefault(kind, 0);
- numberOfComputedNames.put(kind, count + 1);
- }
- }
- }
-
- private void logHistogramOfNames(DexString name) {
- if (Log.ENABLED && Log.isLoggingEnabledFor(StringOptimizer.class)) {
- Integer length = name.size;
- assert histogramOfLengthOfNames != null;
- synchronized (histogramOfLengthOfNames) {
- int count = histogramOfLengthOfNames.getOrDefault(length, 0);
- histogramOfLengthOfNames.put(length, count + 1);
- }
- }
- }
-
- private void logDeferredNameComputation(ClassNameMapping kind) {
- if (Log.ENABLED && Log.isLoggingEnabledFor(StringOptimizer.class)) {
- assert numberOfDeferredComputationOfNames != null;
- synchronized (numberOfDeferredComputationOfNames) {
- int count = numberOfDeferredComputationOfNames.getOrDefault(kind, 0);
- numberOfDeferredComputationOfNames.put(kind, count + 1);
- }
- }
- }
-
- private void logHistogramOfNames(DexItemBasedConstString deferred) {
- if (Log.ENABLED && Log.isLoggingEnabledFor(StringOptimizer.class)) {
- assert deferred.getItem().isDexType();
- DexType original = deferred.getItem().asDexType();
- Integer length = original.descriptor.size;
- assert histogramOfLengthOfDeferredNames != null;
- synchronized (histogramOfLengthOfDeferredNames) {
- int count = histogramOfLengthOfDeferredNames.getOrDefault(length, 0);
- histogramOfLengthOfDeferredNames.put(length, count + 1);
- }
- }
- }
-
// String#valueOf(null) -> "null"
// String#valueOf(String s) -> s
// str.toString() -> str
@@ -527,7 +417,6 @@
TypeElement.stringClassType(appView, definitelyNotNull()), invoke.getLocalInfo());
ConstString nullString = new ConstString(nullStringValue, factory.createString("null"));
it.replaceCurrentInstruction(nullString);
- numberOfSimplifiedConversions++;
} else if (inType.nullability().isDefinitelyNotNull()
&& inType.isClassType()
&& inType.asClassType().getClassType().equals(factory.stringType)) {
@@ -537,7 +426,6 @@
} else {
it.removeOrReplaceByDebugLocalRead();
}
- numberOfSimplifiedConversions++;
}
} else if (instr.isInvokeVirtual()) {
InvokeVirtual invoke = instr.asInvokeVirtual();
@@ -558,7 +446,6 @@
} else {
it.removeOrReplaceByDebugLocalRead();
}
- numberOfSimplifiedConversions++;
}
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
index 15c762b..86a8295 100644
--- a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
+++ b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
@@ -223,9 +223,6 @@
ImmutableList<BasicBlock> blocks = computeLivenessInformation();
performAllocation();
assert code.isConsistentGraph(appView);
- if (Log.ENABLED) {
- Log.debug(this.getClass(), toString());
- }
assert registersUsed() == 0 || unusedRegisters != null;
// Even if the method is reachability sensitive, we do not compute debug information after
// register allocation. We just treat the method as being in debug mode in order to keep
diff --git a/src/main/java/com/android/tools/r8/logging/Log.java b/src/main/java/com/android/tools/r8/logging/Log.java
deleted file mode 100644
index a6d6c24..0000000
--- a/src/main/java/com/android/tools/r8/logging/Log.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.logging;
-
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
-
-public class Log {
-
- public static final boolean ENABLED =
- System.getProperty("com.android.tools.r8.logging.Log.ENABLED") != null;
-
- private static final boolean VERBOSE_ENABLED = false;
- private static final boolean INFO_ENABLED = true;
- private static final boolean DEBUG_ENABLED = true;
- private static final boolean WARN_ENABLED = true;
-
- public static final Set<Class<?>> CLASS_FILTER = getClassFilter();
-
- public static void verbose(Class<?> from, String message, Object... arguments) {
- if (isLoggingEnabledFor(from) && VERBOSE_ENABLED) {
- log("VERB", from, message, arguments);
- }
- }
-
- public static void info(Class<?> from, String message, Object... arguments) {
- if (isLoggingEnabledFor(from) && INFO_ENABLED) {
- log("INFO", from, message, arguments);
- }
- }
-
- public static void debug(Class<?> from, String message, Object... arguments) {
- if (isLoggingEnabledFor(from) && DEBUG_ENABLED) {
- log("DBG", from, message, arguments);
- }
- }
-
- public static void warn(Class<?> from, String message, Object... arguments) {
- if (isLoggingEnabledFor(from) && WARN_ENABLED) {
- log("WARN", from, message, arguments);
- }
- }
-
- public static boolean isLoggingEnabledFor(Class<?> clazz) {
- return ENABLED && (CLASS_FILTER == null || CLASS_FILTER.contains(clazz));
- }
-
- synchronized private static void log(String kind, Class<?> from, String message, Object... args) {
- if (args.length > 0) {
- message = String.format(message, args);
- }
- System.out.println("[" + kind + "] {" + from.getSimpleName() + "}: " + message);
- }
-
- private static Set<Class<?>> getClassFilter() {
- String property = System.getProperty("com.android.tools.r8.logging.Log.CLASS_FILTER");
- if (property != null) {
- try {
- ImmutableSet.Builder<Class<?>> builder = ImmutableSet.builder();
- for (String className : property.split(";")) {
- builder.add(Class.forName(className));
- }
- return builder.build();
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/android/tools/r8/shaking/AbstractMethodRemover.java b/src/main/java/com/android/tools/r8/shaking/AbstractMethodRemover.java
index edfa788..f3a670f 100644
--- a/src/main/java/com/android/tools/r8/shaking/AbstractMethodRemover.java
+++ b/src/main/java/com/android/tools/r8/shaking/AbstractMethodRemover.java
@@ -79,9 +79,6 @@
return true;
}
// We will filter the method out since it is not pinned.
- if (Log.ENABLED) {
- Log.debug(getClass(), "Removing abstract method %s.", method.getReference());
- }
return false;
}
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 1578174..7673d69 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -121,7 +121,6 @@
import com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade;
import com.android.tools.r8.ir.desugar.itf.InterfaceProcessor;
import com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension;
-import com.android.tools.r8.logging.Log;
import com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult;
import com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult;
import com.android.tools.r8.position.Position;
@@ -167,7 +166,6 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import com.google.common.collect.Sets.SetView;
import it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap;
import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
import java.lang.reflect.InvocationHandler;
@@ -1445,9 +1443,6 @@
methodAccessInfoCollection::registerInvokeDirectInContext, invokedMethod, context)) {
return;
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register invokeDirect `%s`.", invokedMethod);
- }
handleInvokeOfDirectTarget(invokedMethod, context, reason);
invokeAnalyses.forEach(analysis -> analysis.traceInvokeDirect(invokedMethod, context));
}
@@ -1466,9 +1461,6 @@
methodAccessInfoCollection::registerInvokeInterfaceInContext, method, context)) {
return;
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register invokeInterface `%s`.", method);
- }
markVirtualMethodAsReachable(method, true, context, keepReason);
invokeAnalyses.forEach(analysis -> analysis.traceInvokeInterface(method, context));
}
@@ -1506,9 +1498,6 @@
methodAccessInfoCollection::registerInvokeStaticInContext, invokedMethod, context)) {
return;
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register invokeStatic `%s`.", invokedMethod);
- }
handleInvokeOfStaticTarget(invokedMethod, context, reason);
invokeAnalyses.forEach(analysis -> analysis.traceInvokeStatic(invokedMethod, context));
}
@@ -1521,9 +1510,6 @@
methodAccessInfoCollection::registerInvokeSuperInContext, invokedMethod, context)) {
return;
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register invokeSuper `%s`.", actualTarget);
- }
workList.enqueueMarkReachableSuperAction(invokedMethod, context);
invokeAnalyses.forEach(analysis -> analysis.traceInvokeSuper(invokedMethod, context));
}
@@ -1551,9 +1537,6 @@
methodAccessInfoCollection::registerInvokeVirtualInContext, invokedMethod, context)) {
return;
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register invokeVirtual `%s`.", invokedMethod);
- }
markVirtualMethodAsReachable(invokedMethod, false, context, reason);
invokeAnalyses.forEach(analysis -> analysis.traceInvokeVirtual(invokedMethod, context));
}
@@ -1733,10 +1716,6 @@
fieldAccessInfoCollection.get(field.getReference()).setReadFromRecordInvokeDynamic();
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register Iget `%s`.", fieldReference);
- }
-
if (field.getReference() != fieldReference) {
// Mark the initial resolution holder as live.
markTypeAsLive(singleResolutionResult.getInitialResolutionHolder(), currentMethod);
@@ -1800,10 +1779,6 @@
fieldAccessInfoCollection.get(field.getReference()).setWrittenFromMethodHandle();
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register Iput `%s`.", fieldReference);
- }
-
if (field.getReference() != fieldReference) {
// Mark the initial resolution holder as live.
markTypeAsLive(singleResolutionResult.getInitialResolutionHolder(), currentMethod);
@@ -1878,10 +1853,6 @@
fieldAccessInfoCollection.get(field.getReference()).setReadFromMethodHandle();
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register Sget `%s`.", fieldReference);
- }
-
if (field.getReference() != fieldReference) {
// Mark the initial resolution holder as live. Note that this should only be done if
// the field
@@ -1962,10 +1933,6 @@
fieldAccessInfoCollection.get(field.getReference()).setWrittenFromMethodHandle();
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Register Sput `%s`.", fieldReference);
- }
-
if (field.getReference() != fieldReference) {
// Mark the initial resolution holder as live. Note that this should only be done if
// the field
@@ -2135,10 +2102,6 @@
}
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Type `%s` has become live.", clazz.type);
- }
-
KeepReason reason = KeepReason.reachableFromLiveType(clazz.type);
for (DexType iface : clazz.getInterfaces()) {
@@ -2767,9 +2730,6 @@
return;
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Class `%s` is instantiated, processing...", clazz);
- }
// This class becomes live, so it and all its supertypes become live types.
markTypeAsLive(clazz, graphReporter.registerClass(clazz, keepReason));
// Instantiation triggers class initialization.
@@ -3401,10 +3361,6 @@
return;
}
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Marking virtual method `%s` as reachable.", method);
- }
-
// We have to mark the resolution targeted, even if it does not become live, we
// need at least an abstract version of it so that it can be targeted.
DexProgramClass resolvedHolder = resolution.getResolvedHolder().asProgramClass();
@@ -3563,13 +3519,6 @@
ProgramMethod method = target.asProgramMethod();
- if (Log.ENABLED) {
- Log.verbose(
- getClass(),
- "Adding super constraint from `%s` to `%s`",
- from,
- target.getReference());
- }
if (superInvokeDependencies
.computeIfAbsent(from.getDefinition(), ignore -> ProgramMethodSet.create())
.add(method)) {
@@ -4547,17 +4496,6 @@
if (mode.isInitialTreeShaking()) {
postProcessingDesugaring();
}
-
- if (Log.ENABLED) {
- Set<DexEncodedMethod> allLive = Sets.newIdentityHashSet();
- Set<DexEncodedMethod> reachableNotLive = Sets.difference(allLive, liveMethods.getItems());
- Log.debug(getClass(), "%s methods are reachable but not live", reachableNotLive.size());
- Log.info(getClass(), "Only reachable: %s", reachableNotLive);
- SetView<DexEncodedMethod> targetedButNotLive =
- Sets.difference(targetedMethods.getItems(), liveMethods.getItems());
- Log.debug(getClass(), "%s methods are targeted but not live", targetedButNotLive.size());
- Log.info(getClass(), "Targeted but not live: %s", targetedButNotLive);
- }
} finally {
timing.end();
}
@@ -4815,9 +4753,6 @@
ProgramMethodSet superCallTargets = superInvokeDependencies.get(method.getDefinition());
if (superCallTargets != null) {
for (ProgramMethod superCallTarget : superCallTargets) {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Found super invoke constraint on `%s`.", superCallTarget);
- }
markMethodAsTargeted(superCallTarget, KeepReason.invokedViaSuperFrom(method));
markVirtualMethodAsLive(superCallTarget, KeepReason.invokedViaSuperFrom(method));
}
@@ -5333,16 +5268,6 @@
DexType serviceType = argument.definition.asConstClass().getValue();
if (!appView.appServices().allServiceTypes().contains(serviceType)) {
// Should never happen.
- if (Log.ENABLED) {
- options.reporter.warning(
- new StringDiagnostic(
- "The type `"
- + serviceType.toSourceString()
- + "` is being passed to the method `"
- + invoke.getInvokedMethod().toSourceString()
- + "`, but was not found in `META-INF/services/`.",
- method.getOrigin()));
- }
return;
}
diff --git a/src/main/java/com/android/tools/r8/shaking/LibraryMethodOverrideAnalysis.java b/src/main/java/com/android/tools/r8/shaking/LibraryMethodOverrideAnalysis.java
index 763f7d4..ef8b2df 100644
--- a/src/main/java/com/android/tools/r8/shaking/LibraryMethodOverrideAnalysis.java
+++ b/src/main/java/com/android/tools/r8/shaking/LibraryMethodOverrideAnalysis.java
@@ -32,11 +32,6 @@
// Note: Set is accessed concurrently and must be thread-safe.
private final Set<DexType> nonEscapingClassesWithLibraryMethodOverrides;
- // Maps each instruction type to the number of times that kind of instruction has caused a type to
- // escape.
- private final Object2IntMap<Class<?>> escapeDebuggingCounters =
- Log.ENABLED ? new Object2IntLinkedOpenHashMap<>() : null;
-
public LibraryMethodOverrideAnalysis(AppView<AppInfoWithLiveness> appView) {
this.appView = appView;
this.nonEscapingClassesWithLibraryMethodOverrides =
@@ -127,16 +122,6 @@
// We need to remove this instance from the set of non-escaping classes if it escapes.
if (escapeAnalysis.isEscaping(code, instruction.outValue())) {
nonEscapingClassesWithLibraryMethodOverrides.remove(type);
-
- if (Log.ENABLED) {
- Set<Instruction> escapeRoutes =
- escapeAnalysis.computeEscapeRoutes(code, instruction.outValue());
- for (Instruction escapeRoute : escapeRoutes) {
- Class<?> instructionClass = escapeRoute.getClass();
- escapeDebuggingCounters.put(
- instructionClass, escapeDebuggingCounters.getInt(instructionClass) + 1);
- }
- }
}
}
}
@@ -159,27 +144,6 @@
return true;
}
- public void logResults() {
- assert Log.ENABLED;
- Log.info(
- getClass(),
- "# classes with library method overrides: %s",
- getClassesWithLibraryMethodOverrides(appView).size());
- Log.info(
- getClass(),
- "# non-escaping classes with library method overrides: %s",
- nonEscapingClassesWithLibraryMethodOverrides.size());
- escapeDebuggingCounters
- .keySet()
- .forEach(
- (instructionClass) ->
- Log.info(
- getClass(),
- "# classes that escaped via %s: %s",
- instructionClass.getSimpleName(),
- escapeDebuggingCounters.getInt(instructionClass)));
- }
-
static class LibraryEscapeAnalysisConfiguration implements EscapeAnalysisConfiguration {
private static final LibraryEscapeAnalysisConfiguration INSTANCE =
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
index 8f3056b..6675dea 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -730,9 +730,6 @@
private boolean skipFlag(String name) {
if (acceptString(name)) {
- if (Log.ENABLED) {
- Log.debug(ProguardConfigurationParser.class, "Skipping '-%s` flag", name);
- }
return true;
}
return false;
@@ -740,9 +737,6 @@
private boolean skipOptionWithSingleArg(String name) {
if (acceptString(name)) {
- if (Log.ENABLED) {
- Log.debug(ProguardConfigurationParser.class, "Skipping '-%s` option", name);
- }
skipSingleArgument();
return true;
}
@@ -751,9 +745,6 @@
private boolean skipOptionWithOptionalSingleArg(String name) {
if (acceptString(name)) {
- if (Log.ENABLED) {
- Log.debug(ProguardConfigurationParser.class, "Skipping '-%s` option", name);
- }
skipWhitespace();
if (isOptionalArgumentGiven()) {
skipSingleArgument();
@@ -765,9 +756,6 @@
private boolean skipOptionWithClassSpec(String name) {
if (acceptString(name)) {
- if (Log.ENABLED) {
- Log.debug(ProguardConfigurationParser.class, "Skipping '-%s` option", name);
- }
try {
ProguardKeepRule.Builder keepRuleBuilder = ProguardKeepRule.builder();
parseClassSpec(keepRuleBuilder, true);
diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index b5810f2..c759ddf 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -664,14 +664,6 @@
methodToKeep,
resolutionMethod,
(rootSetBuilder) -> {
- if (Log.ENABLED) {
- Log.verbose(
- getClass(),
- "Marking method `%s` due to `%s { %s }`.",
- methodToKeep,
- context,
- rule);
- }
DexProgramClass precondition =
testAndGetPrecondition(methodToKeep.getDefinition(), preconditionSupplier);
rootSetBuilder.addItemToSets(methodToKeep, context, rule, precondition, ifRule);
@@ -1081,10 +1073,6 @@
}
for (ProguardMemberRule rule : rules) {
if (rule.matches(method, appView, this::handleMatchedAnnotation, dexStringCache)) {
- if (Log.ENABLED) {
- Log.verbose(
- getClass(), "Marking method `%s` due to `%s { %s }`.", method, context, rule);
- }
if (methodsMarked != null) {
methodsMarked.add(MethodSignatureEquivalence.get().wrap(method.getReference()));
}
@@ -1101,18 +1089,12 @@
ProguardIfRule ifRule) {
for (ProguardMemberRule rule : rules) {
if (rule.matches(field, appView, this::handleMatchedAnnotation, dexStringCache)) {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Marking field `%s` due to `%s { %s }`.", field, context, rule);
- }
addItemToSets(field, context, rule, precondition, ifRule);
}
}
}
private void markClass(DexClass clazz, ProguardConfigurationRule rule, ProguardIfRule ifRule) {
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Marking class `%s` due to `%s`.", clazz.type, rule);
- }
addItemToSets(clazz, rule, null, null, ifRule);
}
diff --git a/src/main/java/com/android/tools/r8/shaking/TreePruner.java b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
index 4a4609f..c5d1fdd 100644
--- a/src/main/java/com/android/tools/r8/shaking/TreePruner.java
+++ b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
@@ -136,9 +136,6 @@
pruneMembersAndAttributes(clazz);
} else {
// The class is completely unused and we can remove it.
- if (Log.ENABLED) {
- Log.debug(getClass(), "Removing class: " + clazz);
- }
prunedTypes.add(clazz.type);
if (clazz.getSourceFile() != null) {
appView.addPrunedClassSourceFile(clazz.type, clazz.getSourceFile().toString());
@@ -345,18 +342,12 @@
reachableMethods.add(method);
continue;
}
- if (Log.ENABLED) {
- Log.debug(getClass(), "Making method %s abstract.", method.getReference());
- }
// Private methods and static methods can only be targeted yet non-live as the result of
// an invalid invoke. They will not actually be called at runtime but we have to keep them
// as non-abstract (see above) to produce the same failure mode.
new ProgramMethod(clazz, method).convertToAbstractOrThrowNullMethod(appView);
reachableMethods.add(method);
} else {
- if (Log.ENABLED) {
- Log.debug(getClass(), "Removing method %s.", method.getReference());
- }
unusedItemsPrinter.registerUnusedMethod(method);
prunedMethods.add(method.getReference());
}
@@ -381,9 +372,6 @@
if (firstUnreachable == -1) {
return null;
}
- if (Log.ENABLED) {
- Log.debug(getClass(), "Removing field %s.", fields.get(firstUnreachable));
- }
DexEncodedField firstUnreachableField = fields.get(firstUnreachable);
unusedItemsPrinter.registerUnusedField(firstUnreachableField);
prunedFields.add(firstUnreachableField.getReference());
@@ -396,9 +384,6 @@
if (isReachableOrReferencedField.test(field)) {
reachableOrReferencedFields.add(field);
} else {
- if (Log.ENABLED) {
- Log.debug(getClass(), "Removing field %s.", field.getReference());
- }
unusedItemsPrinter.registerUnusedField(field);
prunedFields.add(field.getReference());
}
diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index 4dd9d86..ad4a6f2 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -144,10 +144,6 @@
UNSUPPORTED_ATTRIBUTES,
API_REFERENCE_LEVEL;
- public void printLogMessageForClass(DexClass clazz) {
- Log.info(VerticalClassMerger.class, getMessageForClass(clazz));
- }
-
private String getMessageForClass(DexClass clazz) {
String message = null;
switch (this) {
@@ -396,9 +392,6 @@
}
if (appView.appServices().allServiceTypes().contains(sourceClass.type)
&& appInfo.isPinned(targetClass)) {
- if (Log.ENABLED) {
- AbortReason.SERVICE_LOADER.printLogMessageForClass(sourceClass);
- }
return false;
}
if (sourceClass.isAnnotation()) {
@@ -425,9 +418,6 @@
AbortReason reason = disallowInlining(method, targetClass);
if (reason != null) {
// Cannot guarantee that markForceInline() will work.
- if (Log.ENABLED) {
- reason.printLogMessageForClass(sourceClass);
- }
return TraversalContinuation.doBreak();
}
return TraversalContinuation.doContinue();
@@ -439,17 +429,11 @@
if (sourceClass.getEnclosingMethodAttribute() != null
|| !sourceClass.getInnerClasses().isEmpty()) {
// TODO(b/147504070): Consider merging of enclosing-method and inner-class attributes.
- if (Log.ENABLED) {
- AbortReason.UNSUPPORTED_ATTRIBUTES.printLogMessageForClass(sourceClass);
- }
return false;
}
// We abort class merging when merging across nests or from a nest to non-nest.
// Without nest this checks null == null.
if (targetClass.getNestHost() != sourceClass.getNestHost()) {
- if (Log.ENABLED) {
- AbortReason.MERGE_ACROSS_NESTS.printLogMessageForClass(sourceClass);
- }
return false;
}
@@ -479,9 +463,6 @@
if (mergedClasses.containsValue(sourceClass.getType())) {
// Do not allow merging the resulting class into its subclass.
// TODO(christofferqa): Get rid of this limitation.
- if (Log.ENABLED) {
- AbortReason.ALREADY_MERGED.printLogMessageForClass(sourceClass);
- }
return false;
}
// For interface types, this is more complicated, see:
@@ -494,9 +475,6 @@
|| (sourceClass.isInterface()
&& sourceClass.classInitializationMayHaveSideEffects(appView))) {
// TODO(herhut): Handle class initializers.
- if (Log.ENABLED) {
- AbortReason.STATIC_INITIALIZERS.printLogMessageForClass(sourceClass);
- }
return false;
}
boolean sourceCanBeSynchronizedOn =
@@ -506,31 +484,19 @@
appView.appInfo().isLockCandidate(targetClass.type)
|| targetClass.hasStaticSynchronizedMethods();
if (sourceCanBeSynchronizedOn && targetCanBeSynchronizedOn) {
- if (Log.ENABLED) {
- AbortReason.SOURCE_AND_TARGET_LOCK_CANDIDATES.printLogMessageForClass(sourceClass);
- }
return false;
}
if (targetClass.getEnclosingMethodAttribute() != null
|| !targetClass.getInnerClasses().isEmpty()) {
// TODO(b/147504070): Consider merging of enclosing-method and inner-class attributes.
- if (Log.ENABLED) {
- AbortReason.UNSUPPORTED_ATTRIBUTES.printLogMessageForClass(sourceClass);
- }
return false;
}
if (methodResolutionMayChange(sourceClass, targetClass)) {
- if (Log.ENABLED) {
- AbortReason.RESOLUTION_FOR_METHODS_MAY_CHANGE.printLogMessageForClass(sourceClass);
- }
return false;
}
// Field resolution first considers the direct interfaces of [targetClass] before it proceeds
// to the super class.
if (fieldResolutionMayChange(sourceClass, targetClass)) {
- if (Log.ENABLED) {
- AbortReason.RESOLUTION_FOR_FIELDS_MAY_CHANGE.printLogMessageForClass(sourceClass);
- }
return false;
}
// Only merge if api reference level of source class is equal to target class. The check is
@@ -541,9 +507,6 @@
ComputedApiLevel targetApiLevel =
getApiReferenceLevelForMerging(apiLevelCompute, targetClass);
if (!sourceApiLevel.equals(targetApiLevel)) {
- if (Log.ENABLED) {
- AbortReason.API_REFERENCE_LEVEL.printLogMessageForClass(sourceClass);
- }
return false;
}
}
@@ -706,9 +669,6 @@
// Visit the program classes in a top-down order according to the class hierarchy.
TopDownClassHierarchyTraversal.forProgramClasses(appView)
.visit(mergeCandidates, this::mergeClassIfPossible);
- if (Log.ENABLED) {
- Log.debug(getClass(), "Merged %d classes.", mergedClasses.keySet().size());
- }
timing.end();
VerticallyMergedClasses verticallyMergedClasses =
@@ -923,9 +883,6 @@
// Guard against the case where we have two methods that may get the same signature
// if we replace types. This is rare, so we approximate and err on the safe side here.
if (new CollisionDetector(clazz.type, targetClass.type).mayCollide()) {
- if (Log.ENABLED) {
- AbortReason.CONFLICT.printLogMessageForClass(clazz);
- }
return;
}
@@ -946,21 +903,6 @@
lensBuilder.merge(merger.getRenamings());
synthesizedBridges.addAll(merger.getSynthesizedBridges());
}
- if (Log.ENABLED) {
- if (merged) {
- Log.info(
- getClass(),
- "Merged class %s into %s.",
- clazz.toSourceString(),
- targetClass.toSourceString());
- } else {
- Log.info(
- getClass(),
- "Aborted merge for class %s into %s.",
- clazz.toSourceString(),
- targetClass.toSourceString());
- }
- }
}
private boolean fieldResolutionMayChange(DexClass source, DexClass target) {
@@ -1609,17 +1551,6 @@
}
// The method is not actually overridden. This means that we will move `method` to the
// subtype. If `method` is abstract, then so should the subtype be.
- if (Log.ENABLED) {
- if (method.accessFlags.isAbstract() && !target.accessFlags.isAbstract()) {
- Log.warn(
- VerticalClassMerger.class,
- "The non-abstract type `"
- + target.type.toSourceString()
- + "` does not implement the method `"
- + method.getReference().toSourceString()
- + "`.");
- }
- }
return null;
}
diff --git a/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java b/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java
index d661a87..9c47009 100644
--- a/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java
+++ b/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java
@@ -17,10 +17,6 @@
@Override
DexLibraryClass resolveClassConflict(DexLibraryClass a, DexLibraryClass b) {
- if (Log.ENABLED) {
- Log.warn(DexApplication.class,
- "Class `%s` was specified twice as a library type.", a.type.toSourceString());
- }
return a;
}
