Merge "Redesign array type lattice element."
diff --git a/src/main/java/com/android/tools/r8/BaseCompilerCommand.java b/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
index 34a3a93..584b4de 100644
--- a/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
+++ b/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
@@ -25,6 +25,7 @@
private final CompilationMode mode;
private final ProgramConsumer programConsumer;
+ private final StringConsumer mainDexListConsumer;
private final int minApiLevel;
private final Reporter reporter;
private final boolean enableDesugaring;
@@ -33,6 +34,7 @@
BaseCompilerCommand(boolean printHelp, boolean printVersion) {
super(printHelp, printVersion);
programConsumer = null;
+ mainDexListConsumer = null;
mode = null;
minApiLevel = 0;
reporter = new Reporter();
@@ -44,6 +46,7 @@
AndroidApp app,
CompilationMode mode,
ProgramConsumer programConsumer,
+ StringConsumer mainDexListConsumer,
int minApiLevel,
Reporter reporter,
boolean enableDesugaring,
@@ -53,6 +56,7 @@
assert mode != null;
this.mode = mode;
this.programConsumer = programConsumer;
+ this.mainDexListConsumer = mainDexListConsumer;
this.minApiLevel = minApiLevel;
this.reporter = reporter;
this.enableDesugaring = enableDesugaring;
@@ -81,6 +85,13 @@
return programConsumer;
}
+ /**
+ * Get the main dex list consumer that will receive the final complete main dex list.
+ */
+ public StringConsumer getMainDexListConsumer() {
+ return mainDexListConsumer;
+ }
+
/** Get the use-desugaring state. True if enabled, false otherwise. */
public boolean getEnableDesugaring() {
return enableDesugaring;
@@ -109,6 +120,7 @@
extends BaseCommand.Builder<C, B> {
private ProgramConsumer programConsumer = null;
+ private StringConsumer mainDexListConsumer = null;
private Path outputPath = null;
// TODO(b/70656566): Remove default output mode when deprecated API is removed.
private OutputMode outputMode = OutputMode.DexIndexed;
@@ -189,6 +201,13 @@
}
/**
+ * Get the main dex list consumer that will receive the final complete main dex list.
+ */
+ public StringConsumer getMainDexListConsumer() {
+ return mainDexListConsumer;
+ }
+
+ /**
* If set to true, legacy multidex partitioning will be optimized to reduce LinearAlloc usage
* during Dalvik DexOpt. Has no effect when compiling for a target with native multidex support
* or without main dex list specification.
@@ -224,6 +243,33 @@
}
/**
+ * Set an output destination to which main-dex-list content should be written.
+ *
+ * <p>This is a short-hand for setting a {@link StringConsumer.FileConsumer} using {@link
+ * #setMainDexListConsumer}. Note that any subsequent call to this method or {@link
+ * #setMainDexListConsumer} will override the previous setting.
+ *
+ * @param mainDexListOutputPath File-system path to write output at.
+ */
+ public B setMainDexListOutputPath(Path mainDexListOutputPath) {
+ mainDexListConsumer = new StringConsumer.FileConsumer(mainDexListOutputPath);
+ return self();
+ }
+
+ /**
+ * Set a consumer for receiving the main-dex-list content.
+ *
+ * <p>Note that any subsequent call to this method or {@link #setMainDexListOutputPath} will
+ * override the previous setting.
+ *
+ * @param mainDexListConsumer Consumer to receive the content once produced.
+ */
+ public B setMainDexListConsumer(StringConsumer mainDexListConsumer) {
+ this.mainDexListConsumer = mainDexListConsumer;
+ return self();
+ }
+
+ /**
* Set the output path-and-mode.
*
* <p>Setting the output path-and-mode will override any previous set consumer or any previous
diff --git a/src/main/java/com/android/tools/r8/D8Command.java b/src/main/java/com/android/tools/r8/D8Command.java
index e0f330d..f0217b9 100644
--- a/src/main/java/com/android/tools/r8/D8Command.java
+++ b/src/main/java/com/android/tools/r8/D8Command.java
@@ -137,6 +137,8 @@
if (getProgramConsumer() instanceof DexFilePerClassFileConsumer) {
reporter.error("Option --main-dex-list cannot be used with --file-per-class");
}
+ } else if (getMainDexListConsumer() != null) {
+ reporter.error("Option --main-dex-list-output require --main-dex-list");
}
super.validate();
}
@@ -153,6 +155,7 @@
getAppBuilder().build(),
getMode(),
getProgramConsumer(),
+ getMainDexListConsumer(),
getMinApiLevel(),
getReporter(),
!getDisableDesugaring(),
@@ -209,6 +212,7 @@
AndroidApp inputApp,
CompilationMode mode,
ProgramConsumer programConsumer,
+ StringConsumer mainDexListConsumer,
int minApiLevel,
Reporter diagnosticsHandler,
boolean enableDesugaring,
@@ -218,6 +222,7 @@
inputApp,
mode,
programConsumer,
+ mainDexListConsumer,
minApiLevel,
diagnosticsHandler,
enableDesugaring,
@@ -235,6 +240,7 @@
assert !internal.debug;
internal.debug = getMode() == CompilationMode.DEBUG;
internal.programConsumer = getProgramConsumer();
+ internal.mainDexListConsumer = getMainDexListConsumer();
internal.minimalMainDex = internal.debug;
internal.minApiLevel = getMinApiLevel();
internal.intermediate = intermediate;
diff --git a/src/main/java/com/android/tools/r8/D8CommandParser.java b/src/main/java/com/android/tools/r8/D8CommandParser.java
index a933b8f..b84b398 100644
--- a/src/main/java/com/android/tools/r8/D8CommandParser.java
+++ b/src/main/java/com/android/tools/r8/D8CommandParser.java
@@ -104,6 +104,7 @@
" --file-per-class # Produce a separate dex file per input class",
" --no-desugaring # Force disable desugaring.",
" --main-dex-list <file> # List of classes to place in the primary dex file.",
+ " --main-dex-list-output <file> # Output resulting main dex list in <file>.",
" --version # Print the version of d8.",
" --help # Print this message."));
@@ -198,6 +199,8 @@
}
} else if (arg.equals("--main-dex-list")) {
builder.addMainDexListFiles(Paths.get(expandedArgs[++i]));
+ } else if (arg.equals("--main-dex-list-output")) {
+ builder.setMainDexListOutputPath(Paths.get(expandedArgs[++i]));
} else if (arg.equals("--optimize-multidex-for-linearalloc")) {
builder.setOptimizeMultidexForLinearAlloc(true);
} else if (arg.equals("--min-api")) {
diff --git a/src/main/java/com/android/tools/r8/DexIndexedConsumer.java b/src/main/java/com/android/tools/r8/DexIndexedConsumer.java
index 118df2e..e235e67 100644
--- a/src/main/java/com/android/tools/r8/DexIndexedConsumer.java
+++ b/src/main/java/com/android/tools/r8/DexIndexedConsumer.java
@@ -160,7 +160,7 @@
public void accept(
int fileIndex, ByteDataView data, Set<String> descriptors, DiagnosticsHandler handler) {
super.accept(fileIndex, data, descriptors, handler);
- outputBuilder.addFile(getDexFileName(fileIndex), data, handler);
+ outputBuilder.addIndexedClassFile(fileIndex, getDexFileName(fileIndex), data, handler);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index 6906161..6d00ebb 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -304,7 +304,10 @@
.prunedCopyFrom(application, pruner.getRemovedClasses()));
new AbstractMethodRemover(appView.appInfo()).run();
}
- new AnnotationRemover(appView.appInfo().withLiveness(), compatibility, options).run();
+
+ new AnnotationRemover(appView.appInfo().withLiveness(), options)
+ .ensureValid(compatibility)
+ .run();
// TODO(69445518): This is still work in progress, and this file writing is currently used
// for testing.
@@ -478,6 +481,8 @@
// Print reasons on the application after pruning, so that we reflect the actual result.
ReasonPrinter reasonPrinter = enqueuer.getReasonPrinter(rootSet.reasonAsked);
reasonPrinter.run(application);
+ // Remove annotations that refer to types that no longer exist.
+ new AnnotationRemover(appView.appInfo().withLiveness(), options).run();
}
} finally {
timing.end();
diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index a1858a9..338fb4f 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -90,8 +90,6 @@
private boolean allowPartiallyImplementedProguardOptions = false;
private boolean allowTestProguardOptions = false;
- private StringConsumer mainDexListConsumer = null;
-
// TODO(zerny): Consider refactoring CompatProguardCommandBuilder to avoid subclassing.
Builder() {
this(new DefaultR8DiagnosticsHandler());
@@ -178,33 +176,6 @@
return self();
}
- /**
- * Set an output destination to which main-dex-list content should be written.
- *
- * <p>This is a short-hand for setting a {@link StringConsumer.FileConsumer} using {@link
- * #setMainDexListConsumer}. Note that any subsequent call to this method or {@link
- * #setMainDexListConsumer} will override the previous setting.
- *
- * @param mainDexListOutputPath File-system path to write output at.
- */
- public Builder setMainDexListOutputPath(Path mainDexListOutputPath) {
- mainDexListConsumer = new StringConsumer.FileConsumer(mainDexListOutputPath);
- return self();
- }
-
- /**
- * Set a consumer for receiving the main-dex-list content.
- *
- * <p>Note that any subsequent call to this method or {@link #setMainDexListOutputPath} will
- * override the previous setting.
- *
- * @param mainDexListConsumer Consumer to receive the content once produced.
- */
- public Builder setMainDexListConsumer(StringConsumer mainDexListConsumer) {
- this.mainDexListConsumer = mainDexListConsumer;
- return self();
- }
-
/** Add proguard configuration-file resources. */
public Builder addProguardConfigurationFiles(Path... paths) {
guard(() -> {
@@ -321,7 +292,7 @@
if (getProgramConsumer() instanceof DexFilePerClassFileConsumer) {
reporter.error("R8 does not support compiling to a single DEX file per Java class file");
}
- if (mainDexListConsumer != null
+ if (getMainDexListConsumer() != null
&& mainDexRules.isEmpty()
&& !getAppBuilder().hasMainDexList()) {
reporter.error(
@@ -433,7 +404,7 @@
getAppBuilder().build(),
getProgramConsumer(),
mainDexKeepRules,
- mainDexListConsumer,
+ getMainDexListConsumer(),
configuration,
getMode(),
getMinApiLevel(),
@@ -503,7 +474,6 @@
static final String USAGE_MESSAGE = R8CommandParser.USAGE_MESSAGE;
private final ImmutableList<ProguardConfigurationRule> mainDexKeepRules;
- private final StringConsumer mainDexListConsumer;
private final ProguardConfiguration proguardConfiguration;
private final boolean enableTreeShaking;
private final boolean enableMinification;
@@ -576,12 +546,11 @@
StringConsumer proguardMapConsumer,
Path proguardCompatibilityRulesOutput,
boolean optimizeMultidexForLinearAlloc) {
- super(inputApp, mode, programConsumer, minApiLevel, reporter, enableDesugaring,
- optimizeMultidexForLinearAlloc);
+ super(inputApp, mode, programConsumer, mainDexListConsumer, minApiLevel, reporter,
+ enableDesugaring, optimizeMultidexForLinearAlloc);
assert proguardConfiguration != null;
assert mainDexKeepRules != null;
this.mainDexKeepRules = mainDexKeepRules;
- this.mainDexListConsumer = mainDexListConsumer;
this.proguardConfiguration = proguardConfiguration;
this.enableTreeShaking = enableTreeShaking;
this.enableMinification = enableMinification;
@@ -594,7 +563,6 @@
private R8Command(boolean printHelp, boolean printVersion) {
super(printHelp, printVersion);
mainDexKeepRules = ImmutableList.of();
- mainDexListConsumer = null;
proguardConfiguration = null;
enableTreeShaking = false;
enableMinification = false;
@@ -641,7 +609,7 @@
assert !internal.verbose;
internal.mainDexKeepRules = mainDexKeepRules;
internal.minimalMainDex = getMode() == CompilationMode.DEBUG;
- internal.mainDexListConsumer = mainDexListConsumer;
+ internal.mainDexListConsumer = getMainDexListConsumer();
internal.lineNumberOptimization =
!internal.debug && (proguardConfiguration.isOptimizing() || internal.enableMinification)
? LineNumberOptimization.ON
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 29d54b4..bdea79c 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "1.4.12-dev";
+ public static final String LABEL = "1.4.13-dev";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/cf/code/CfDexItemBasedConstString.java b/src/main/java/com/android/tools/r8/cf/code/CfDexItemBasedConstString.java
index 627bbe6..f0c9636 100644
--- a/src/main/java/com/android/tools/r8/cf/code/CfDexItemBasedConstString.java
+++ b/src/main/java/com/android/tools/r8/cf/code/CfDexItemBasedConstString.java
@@ -6,24 +6,34 @@
import com.android.tools.r8.cf.CfPrinter;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.DexReference;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.graph.UseRegistry;
import com.android.tools.r8.ir.conversion.CfSourceCode;
import com.android.tools.r8.ir.conversion.CfState;
import com.android.tools.r8.ir.conversion.IRBuilder;
+import com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo;
import com.android.tools.r8.naming.NamingLens;
import org.objectweb.asm.MethodVisitor;
public class CfDexItemBasedConstString extends CfInstruction {
- private DexReference item;
+ private final DexReference item;
+ private final ClassNameComputationInfo classNameComputationInfo;
- public CfDexItemBasedConstString(DexReference item) {
+ public CfDexItemBasedConstString(
+ DexReference item, ClassNameComputationInfo classNameComputationInfo) {
this.item = item;
+ this.classNameComputationInfo = classNameComputationInfo;
}
public DexReference getItem() {
return item;
}
+ public ClassNameComputationInfo getClassNameComputationInfo() {
+ return classNameComputationInfo;
+ }
+
@Override
public CfDexItemBasedConstString asDexItemBasedConstString() {
return this;
@@ -52,6 +62,13 @@
}
@Override
+ public void registerUse(UseRegistry registry, DexType clazz) {
+ if (item.isDexType() && classNameComputationInfo.needsToRegisterTypeReference()) {
+ registry.registerTypeReference(item.asDexType());
+ }
+ }
+
+ @Override
public void buildIR(IRBuilder builder, CfState state, CfSourceCode code) {
builder.addDexItemBasedConstString(state.push(builder.getFactory().stringType).register, item);
}
diff --git a/src/main/java/com/android/tools/r8/code/DexItemBasedConstString.java b/src/main/java/com/android/tools/r8/code/DexItemBasedConstString.java
index 1871c41..a55ddfa 100644
--- a/src/main/java/com/android/tools/r8/code/DexItemBasedConstString.java
+++ b/src/main/java/com/android/tools/r8/code/DexItemBasedConstString.java
@@ -6,7 +6,9 @@
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.DexReference;
import com.android.tools.r8.graph.ObjectToOffsetMapping;
+import com.android.tools.r8.graph.UseRegistry;
import com.android.tools.r8.ir.conversion.IRBuilder;
+import com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo;
import com.android.tools.r8.naming.ClassNameMapper;
import java.nio.ShortBuffer;
@@ -15,14 +17,22 @@
public static final String NAME = "DexItemBasedConstString";
public static final String SMALI_NAME = "const-string*";
- public DexItemBasedConstString(int register, DexReference string) {
+ private final ClassNameComputationInfo classNameComputationInfo;
+
+ public DexItemBasedConstString(
+ int register, DexReference string, ClassNameComputationInfo classNameComputationInfo) {
super(register, string);
+ this.classNameComputationInfo = classNameComputationInfo;
}
public DexReference getItem() {
return (DexReference) BBBB;
}
+ public ClassNameComputationInfo getClassNameComputationInfo() {
+ return classNameComputationInfo;
+ }
+
@Override
public String getName() {
return NAME;
@@ -68,6 +78,13 @@
}
@Override
+ public void registerUse(UseRegistry registry) {
+ if (getItem().isDexType() && classNameComputationInfo.needsToRegisterTypeReference()) {
+ registry.registerTypeReference(getItem().asDexType());
+ }
+ }
+
+ @Override
public void buildIR(IRBuilder builder) {
builder.addDexItemBasedConstString(AA, (DexReference) BBBB);
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
index 0474696..46738e2 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -1203,14 +1203,14 @@
optimizationInfo = info;
}
- public void copyMetadataFromInlinee(DexEncodedMethod inlinee) {
+ public void copyMetadata(DexEncodedMethod from) {
checkIfObsolete();
// Record that the current method uses identifier name string if the inlinee did so.
- if (inlinee.getOptimizationInfo().useIdentifierNameString()) {
+ if (from.getOptimizationInfo().useIdentifierNameString()) {
getMutableOptimizationInfo().markUseIdentifierNameString();
}
- if (inlinee.classFileVersion > classFileVersion) {
- upgradeClassFileVersion(inlinee.getClassFileVersion());
+ if (from.classFileVersion > classFileVersion) {
+ upgradeClassFileVersion(from.getClassFileVersion());
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
index 8139a414..952038a 100644
--- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
+++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -132,6 +132,9 @@
public final DexString containsMethodName = createString("contains");
public final DexString startsWithMethodName = createString("startsWith");
public final DexString endsWithMethodName = createString("endsWith");
+ public final DexString equalsMethodName = createString("equals");
+ public final DexString equalsIgnoreCaseMethodName = createString("equalsIgnoreCase");
+ public final DexString contentEqualsMethodName = createString("contentEquals");
public final DexString valueOfMethodName = createString("valueOf");
public final DexString toStringMethodName = createString("toString");
@@ -584,6 +587,9 @@
public final DexMethod contains;
public final DexMethod startsWith;
public final DexMethod endsWith;
+ public final DexMethod equals;
+ public final DexMethod equalsIgnoreCase;
+ public final DexMethod contentEqualsCharSequence;
public final DexMethod valueOf;
public final DexMethod toString;
@@ -594,17 +600,25 @@
length = createMethod(
stringDescriptor, lengthMethodName, intDescriptor, DexString.EMPTY_ARRAY);
- DexString[] needsOneCharSequence = new DexString[]{charSequenceDescriptor};
+ DexString[] needsOneCharSequence = { charSequenceDescriptor };
+ DexString[] needsOneString = { stringDescriptor };
+ DexString[] needsOneObject = { objectDescriptor };
+
contains = createMethod(
stringDescriptor, containsMethodName, booleanDescriptor, needsOneCharSequence);
- DexString[] needsOneString = new DexString[]{stringDescriptor};
startsWith = createMethod(
stringDescriptor, startsWithMethodName, booleanDescriptor, needsOneString);
endsWith = createMethod(
stringDescriptor, endsWithMethodName, booleanDescriptor, needsOneString);
+ equals = createMethod(
+ stringDescriptor, equalsMethodName, booleanDescriptor, needsOneObject);
+ equalsIgnoreCase = createMethod(
+ stringDescriptor, equalsIgnoreCaseMethodName, booleanDescriptor, needsOneString);
+ contentEqualsCharSequence = createMethod(
+ stringDescriptor, contentEqualsMethodName, booleanDescriptor, needsOneCharSequence);
valueOf = createMethod(
- stringDescriptor, valueOfMethodName, stringDescriptor, new DexString[]{objectDescriptor});
+ stringDescriptor, valueOfMethodName, stringDescriptor, needsOneObject);
toString = createMethod(
stringDescriptor, toStringMethodName, stringDescriptor, DexString.EMPTY_ARRAY);
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexValue.java b/src/main/java/com/android/tools/r8/graph/DexValue.java
index 6eb69b8..c0413e0 100644
--- a/src/main/java/com/android/tools/r8/graph/DexValue.java
+++ b/src/main/java/com/android/tools/r8/graph/DexValue.java
@@ -11,6 +11,7 @@
import com.android.tools.r8.ir.code.ConstNumber;
import com.android.tools.r8.ir.code.Instruction;
import com.android.tools.r8.ir.code.Value;
+import com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo;
import com.android.tools.r8.utils.EncodedValueUtils;
import java.util.Arrays;
import org.objectweb.asm.Handle;
@@ -719,9 +720,20 @@
}
public static class DexItemBasedValueString extends NestedDexValue<DexReference> {
+ private final ClassNameComputationInfo classNameComputationInfo;
public DexItemBasedValueString(DexReference value) {
+ this(value, ClassNameComputationInfo.none());
+ }
+
+ public DexItemBasedValueString(
+ DexReference value, ClassNameComputationInfo classNameComputationInfo) {
super(value);
+ this.classNameComputationInfo = classNameComputationInfo;
+ }
+
+ public ClassNameComputationInfo getClassNameComputationInfo() {
+ return classNameComputationInfo;
}
@Override
diff --git a/src/main/java/com/android/tools/r8/ir/code/DexItemBasedConstString.java b/src/main/java/com/android/tools/r8/ir/code/DexItemBasedConstString.java
index 3ec7971..2b54a4b 100644
--- a/src/main/java/com/android/tools/r8/ir/code/DexItemBasedConstString.java
+++ b/src/main/java/com/android/tools/r8/ir/code/DexItemBasedConstString.java
@@ -13,25 +13,38 @@
import com.android.tools.r8.ir.analysis.type.TypeLatticeElement;
import com.android.tools.r8.ir.conversion.CfBuilder;
import com.android.tools.r8.ir.conversion.DexBuilder;
+import com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo;
public class DexItemBasedConstString extends ConstInstruction {
private final DexReference item;
+ private final ClassNameComputationInfo classNameComputationInfo;
public DexItemBasedConstString(Value dest, DexReference item) {
+ this(dest, item, ClassNameComputationInfo.none());
+ }
+
+ public DexItemBasedConstString(
+ Value dest, DexReference item, ClassNameComputationInfo classNameComputationInfo) {
super(dest);
dest.markNeverNull();
this.item = item;
+ this.classNameComputationInfo = classNameComputationInfo;
}
public static DexItemBasedConstString copyOf(Value newValue, DexItemBasedConstString original) {
- return new DexItemBasedConstString(newValue, original.getItem());
+ return new DexItemBasedConstString(
+ newValue, original.getItem(), original.classNameComputationInfo);
}
public DexReference getItem() {
return item;
}
+ public ClassNameComputationInfo getClassNameComputationInfo() {
+ return classNameComputationInfo;
+ }
+
@Override
public boolean isDexItemBasedConstString() {
return true;
@@ -45,7 +58,10 @@
@Override
public void buildDex(DexBuilder builder) {
int dest = builder.allocatedRegister(outValue(), getNumber());
- builder.add(this, new com.android.tools.r8.code.DexItemBasedConstString(dest, item));
+ builder.add(
+ this,
+ new com.android.tools.r8.code.DexItemBasedConstString(
+ dest, item, classNameComputationInfo));
}
@Override
@@ -99,7 +115,7 @@
@Override
public void buildCf(CfBuilder builder) {
- builder.add(new CfDexItemBasedConstString(item));
+ builder.add(new CfDexItemBasedConstString(item, classNameComputationInfo));
}
@Override
@@ -109,6 +125,6 @@
@Override
public TypeLatticeElement evaluate(AppInfo appInfo) {
- return TypeLatticeElement.fromDexType(appInfo.dexItemFactory.stringType, false, appInfo);
+ return TypeLatticeElement.stringClassType(appInfo);
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/Value.java b/src/main/java/com/android/tools/r8/ir/code/Value.java
index 644dfa3..b4ad228 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Value.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Value.java
@@ -726,6 +726,12 @@
return isConstant() && getConstInstruction().isDexItemBasedConstString();
}
+ public boolean isDexItemBasedConstStringThatNeedsToComputeClassName() {
+ return isDexItemBasedConstString()
+ && getConstInstruction().asDexItemBasedConstString()
+ .getClassNameComputationInfo().needsToComputeClassName();
+ }
+
public boolean isConstClass() {
return isConstant() && getConstInstruction().isConstClass();
}
@@ -762,7 +768,9 @@
* Returns whether this value is known to never be <code>null</code>.
*/
public boolean isNeverNull() {
- return neverNull || (definition != null && definition.isNonNull());
+ return neverNull
+ || (definition != null && definition.isNonNull())
+ || (typeLattice.isReference() && typeLattice.nullElement().isDefinitelyNotNull());
}
public boolean canBeNull() {
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
index a658474..8f32081 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
@@ -28,7 +28,6 @@
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.graph.GraphLense;
import com.android.tools.r8.ir.analysis.type.TypeLatticeElement;
-import com.android.tools.r8.ir.code.Add;
import com.android.tools.r8.ir.code.Argument;
import com.android.tools.r8.ir.code.BasicBlock;
import com.android.tools.r8.ir.code.CatchHandlers;
@@ -45,7 +44,6 @@
import com.android.tools.r8.ir.code.Position;
import com.android.tools.r8.ir.code.StackValue;
import com.android.tools.r8.ir.code.StackValues;
-import com.android.tools.r8.ir.code.Store;
import com.android.tools.r8.ir.code.Value;
import com.android.tools.r8.ir.code.Xor;
import com.android.tools.r8.ir.optimize.CodeRewriter;
@@ -385,75 +383,59 @@
private void rewriteIincPatterns() {
for (BasicBlock block : code.blocks) {
- if (block.getInstructions().size() < IINC_PATTERN_SIZE) {
- continue;
- }
- int earliestAddInstrIdx = 2;
- int latestAddInstrIdx = block.getInstructions().size() - 3;
ListIterator<Instruction> it = block.getInstructions().listIterator();
- int instrIdx = -1;
- while (it.hasNext()) {
- ++instrIdx;
- Instruction current = it.next();
- if (instrIdx < earliestAddInstrIdx || latestAddInstrIdx < instrIdx || !current.isAdd()) {
- continue;
- }
- it.previous();
- it.previous();
- it.previous();
- Instruction instruction0 = it.next();
- Instruction instruction1 = it.next();
- Add instruction2 = it.next().asAdd();
- Store instruction3 = it.next().asStore();
-
- // Set bail-out position after Add.
- it.previous();
-
- if (instruction3 == null) {
+ // Test that we have enough instructions for iinc.
+ while (IINC_PATTERN_SIZE <= block.getInstructions().size() - it.nextIndex()) {
+ Instruction loadOrConst1 = it.next();
+ if (!loadOrConst1.isLoad() && !loadOrConst1.isConstNumber()) {
continue;
}
Load load;
ConstNumber constNumber;
-
- if (instruction0.isLoad()) {
- load = instruction0.asLoad();
- constNumber = instruction1.asConstNumber();
+ if (loadOrConst1.isLoad()) {
+ load = loadOrConst1.asLoad();
+ constNumber = it.next().asConstNumber();
} else {
- constNumber = instruction0.asConstNumber();
- load = instruction1.asLoad();
+ load = it.next().asLoad();
+ constNumber = loadOrConst1.asConstNumber();
}
-
+ Instruction add = it.next().asAdd();
+ Instruction store = it.next().asStore();
+ // Reset pointer to load.
+ it.previous();
+ it.previous();
+ it.previous();
+ it.previous();
if (load == null
|| constNumber == null
+ || add == null
+ || store == null
|| constNumber.outValue().getTypeLattice() != TypeLatticeElement.INT) {
+ it.next();
continue;
}
-
int increment = constNumber.getIntValue();
if (increment < Byte.MIN_VALUE || Byte.MAX_VALUE < increment) {
+ it.next();
continue;
}
-
- int register = getLocalRegister(load.inValues().get(0));
- if (register != getLocalRegister(instruction3.outValue())) {
+ if (getLocalRegister(load.src()) != getLocalRegister(store.outValue())) {
+ it.next();
continue;
}
- Position position = instruction2.getPosition();
- if (position != instruction0.getPosition()
- || position != instruction1.getPosition()
- || position != instruction3.getPosition()) {
+ Position position = add.getPosition();
+ if (position != load.getPosition()
+ || position != constNumber.getPosition()
+ || position != store.getPosition()) {
continue;
}
- it.previous();
- it.previous();
- it.previous();
it.remove();
it.next();
it.remove();
it.next();
it.remove();
it.next();
- Inc inc = new Inc(instruction3.outValue(), load.inValues().get(0), increment);
+ Inc inc = new Inc(store.outValue(), load.inValues().get(0), increment);
inc.setPosition(position);
inc.setBlock(block);
it.set(inc);
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 f0d5d7b..38842da 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
@@ -36,6 +36,8 @@
import com.android.tools.r8.ir.code.Instruction;
import com.android.tools.r8.ir.code.InstructionListIterator;
import com.android.tools.r8.ir.code.InvokeMethod;
+import com.android.tools.r8.ir.code.InvokeStatic;
+import com.android.tools.r8.ir.code.NumericType;
import com.android.tools.r8.ir.code.Value;
import com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer;
import com.android.tools.r8.ir.desugar.InterfaceMethodRewriter;
@@ -74,6 +76,7 @@
import com.android.tools.r8.utils.Timing;
import com.google.common.base.Suppliers;
import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Sets;
import java.util.ArrayList;
@@ -93,6 +96,7 @@
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.Predicate;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
public class IRConverter {
@@ -175,7 +179,8 @@
assert appInfo.hasLiveness();
AppInfoWithLiveness appInfoWithLiveness = appInfo.withLiveness();
AppView<? extends AppInfoWithLiveness> appViewWithLiveness = appView.withLiveness();
- this.nonNullTracker = new NonNullTracker(appInfo);
+ this.nonNullTracker =
+ new NonNullTracker(appInfo, libraryMethodsReturningNonNull(appInfo.dexItemFactory));
this.inliner = new Inliner(appViewWithLiveness, this, options);
this.outliner = new Outliner(appInfoWithLiveness, options, this);
this.memberValuePropagation =
@@ -288,6 +293,16 @@
return methods;
}
+ // Library methods listed here are based on their original implementations. That is, we assume
+ // these cannot be overridden.
+ public static Set<DexMethod> libraryMethodsReturningNonNull(DexItemFactory factory) {
+ return ImmutableSet.of(
+ factory.stringMethods.valueOf,
+ factory.classMethods.getName,
+ factory.classMethods.getSimpleName
+ );
+ }
+
private void removeLambdaDeserializationMethods() {
if (lambdaRewriter != null) {
lambdaRewriter.removeLambdaDeserializationMethods(appInfo.classes());
@@ -887,12 +902,6 @@
inliner.performInlining(method, code, isProcessedConcurrently, callSiteInformation);
}
- // Either marked by IdentifierNameStringMarker or propagated from inlinee.
- // Then, make it visible to IdentifierMinifier.
- if (method.getOptimizationInfo().useIdentifierNameString()) {
- feedback.markUseIdentifierNameString(method);
- }
-
if (appInfo.hasLiveness()) {
// Reflection optimization 1. getClass() -> const-class
codeRewriter.rewriteGetClass(code);
@@ -908,6 +917,12 @@
assert code.isConsistentSSA();
}
+ // Either marked by IdentifierNameStringMarker or name reflection, or propagated from inlinee.
+ // Then, make it visible to IdentifierMinifier.
+ if (method.getOptimizationInfo().useIdentifierNameString()) {
+ feedback.markUseIdentifierNameString(method);
+ }
+
if (devirtualizer != null) {
assert code.verifyTypes(appInfo, appView, graphLense());
devirtualizer.devirtualizeInvokeInterface(code, method.method.getHolder());
@@ -1243,20 +1258,116 @@
}
}
+ /**
+ * For each block, we look to see if the header matches:
+ *
+ * <pre>
+ * pseudo-instructions*
+ * v2 <- long-{mul,div} v0 v1
+ * pseudo-instructions*
+ * v5 <- long-{add,sub} v3 v4
+ * </pre>
+ *
+ * where v2 ~=~ v3 or v2 ~=~ v4 (with ~=~ being equal or an alias of) and the block is not a
+ * fallthrough target.
+ */
private void materializeInstructionBeforeLongOperationsWorkaround(IRCode code) {
if (!options.canHaveDex2OatLinkedListBug()) {
return;
}
+ DexItemFactory factory = options.itemFactory;
+ final Supplier<DexMethod> javaLangLangSignum =
+ Suppliers.memoize(
+ () ->
+ factory.createMethod(
+ factory.createString("Ljava/lang/Long;"),
+ factory.createString("signum"),
+ factory.intDescriptor,
+ new DexString[] {factory.longDescriptor}));
for (BasicBlock block : code.blocks) {
InstructionListIterator it = block.listIterator();
- Instruction firstMaterializing =
- it.nextUntil(IRConverter::isMaterializingInstructionOnArtArmVersionM);
- if (needsInstructionBeforeLongOperation(firstMaterializing)) {
- ensureInstructionBefore(code, firstMaterializing, it);
+ Instruction firstMaterializing = it.nextUntil(IRConverter::isNotPseudoInstruction);
+ if (!isLongMul(firstMaterializing)) {
+ continue;
+ }
+ Instruction secondMaterializing = it.nextUntil(IRConverter::isNotPseudoInstruction);
+ if (!isLongAddOrSub(secondMaterializing)) {
+ continue;
+ }
+ if (isFallthoughTarget(block)) {
+ continue;
+ }
+ Value outOfMul = firstMaterializing.outValue();
+ for (Value inOfAddOrSub : secondMaterializing.inValues()) {
+ if (isAliasOf(inOfAddOrSub, outOfMul)) {
+ it = block.listIterator();
+ it.nextUntil(i -> i == firstMaterializing);
+ Value longValue = firstMaterializing.inValues().get(0);
+ InvokeStatic invokeLongSignum =
+ new InvokeStatic(
+ javaLangLangSignum.get(), null, Collections.singletonList(longValue));
+ ensureThrowingInstructionBefore(code, firstMaterializing, it, invokeLongSignum);
+ return;
+ }
}
}
}
+ private static boolean isAliasOf(Value usedValue, Value definingValue) {
+ while (true) {
+ if (usedValue == definingValue) {
+ return true;
+ }
+ Instruction definition = usedValue.definition;
+ if (definition == null || !definition.isMove()) {
+ return false;
+ }
+ usedValue = definition.asMove().src();
+ }
+ }
+
+ private static boolean isNotPseudoInstruction(Instruction instruction) {
+ return !(instruction.isDebugInstruction() || instruction.isMove());
+ }
+
+ private static boolean isLongMul(Instruction instruction) {
+ return instruction != null
+ && instruction.isMul()
+ && instruction.asBinop().getNumericType() == NumericType.LONG
+ && instruction.outValue() != null;
+ }
+
+ private static boolean isLongAddOrSub(Instruction instruction) {
+ return instruction != null
+ && (instruction.isAdd() || instruction.isSub())
+ && instruction.asBinop().getNumericType() == NumericType.LONG;
+ }
+
+ private static boolean isFallthoughTarget(BasicBlock block) {
+ for (BasicBlock pred : block.getPredecessors()) {
+ if (pred.exit().fallthroughBlock() == block) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void ensureThrowingInstructionBefore(
+ IRCode code, Instruction addBefore, InstructionListIterator it, Instruction instruction) {
+ Instruction check = it.previous();
+ assert addBefore == check;
+ BasicBlock block = check.getBlock();
+ if (block.hasCatchHandlers()) {
+ // Split so the existing instructions retain their handlers and the new instruction has none.
+ BasicBlock split = it.split(code);
+ assert split.hasCatchHandlers();
+ assert !block.hasCatchHandlers();
+ it = block.listIterator(block.getInstructions().size() - 1);
+ }
+ instruction.setPosition(addBefore.getPosition());
+ it.add(instruction);
+ }
+
private static void ensureInstructionBefore(
IRCode code, Instruction addBefore, InstructionListIterator it) {
// Force materialize a constant-zero before the long operation.
@@ -1275,33 +1386,6 @@
it.add(fixitUser);
}
- private static boolean needsInstructionBeforeLongOperation(Instruction instruction) {
- // The cortex fixup will only trigger on long sub and long add instructions.
- if (!((instruction.isAdd() || instruction.isSub()) && instruction.outType().isWide())) {
- return false;
- }
- // If the block with the instruction is a fallthrough block, then it can't end up being
- // preceded by the incorrectly linked prologue/epilogue..
- BasicBlock block = instruction.getBlock();
- for (BasicBlock pred : block.getPredecessors()) {
- if (pred.exit().fallthroughBlock() == block) {
- return false;
- }
- }
- return true;
- }
-
- private static boolean isMaterializingInstructionOnArtArmVersionM(Instruction instruction) {
- return !instruction.isDebugInstruction()
- && !instruction.isMove()
- && !isPossiblyNonMaterializingLongOperationOnArtArmVersionM(instruction);
- }
-
- private static boolean isPossiblyNonMaterializingLongOperationOnArtArmVersionM(
- Instruction instruction) {
- return (instruction.isMul() || instruction.isDiv()) && instruction.outType().isWide();
- }
-
private void printC1VisualizerHeader(DexEncodedMethod method) {
if (printer != null) {
printer.begin("compilation");
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/OptimizationFeedbackDelayed.java b/src/main/java/com/android/tools/r8/ir/conversion/OptimizationFeedbackDelayed.java
index 3ef25f5..5dbdbe1 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/OptimizationFeedbackDelayed.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/OptimizationFeedbackDelayed.java
@@ -59,7 +59,7 @@
}
@Override
- public void markUseIdentifierNameString(DexEncodedMethod method) {
+ public synchronized void markUseIdentifierNameString(DexEncodedMethod method) {
getOptimizationInfoForUpdating(method).markUseIdentifierNameString();
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
index 01555da..7a9ec00 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
@@ -531,6 +531,7 @@
encodedMethod.annotations,
encodedMethod.parameterAnnotationsList,
encodedMethod.getCode());
+ newMethod.copyMetadata(encodedMethod);
rewriter.methodMapping.put(encodedMethod.method, callTarget);
// TODO(ager): Should we give the new first parameter an actual name? Maybe 'this'?
DexCode dexCode = newMethod.getCode().asDexCode();
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
index 3424431..785041c 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -151,8 +151,10 @@
private final Set<DexMethod> libraryMethodsReturningReceiver;
private final InternalOptions options;
- public CodeRewriter(IRConverter converter,
- Set<DexMethod> libraryMethodsReturningReceiver, InternalOptions options) {
+ public CodeRewriter(
+ IRConverter converter,
+ Set<DexMethod> libraryMethodsReturningReceiver,
+ InternalOptions options) {
this.converter = converter;
this.appInfo = converter.appInfo;
this.options = options;
@@ -1531,15 +1533,15 @@
return;
}
AppInfoWithLiveness appInfoWithLiveness = appInfo.withLiveness();
+ Set<Value> needToWidenValues = Sets.newIdentityHashSet();
+ Set<Value> needToNarrowValues = Sets.newIdentityHashSet();
InstructionIterator iterator = code.instructionIterator();
while (iterator.hasNext()) {
Instruction current = iterator.next();
if (current.isInvokeMethod()) {
InvokeMethod invoke = current.asInvokeMethod();
if (invoke.outValue() != null && !invoke.outValue().hasLocalInfo()) {
- boolean isLibraryMethodReturningReceiver =
- libraryMethodsReturningReceiver.contains(invoke.getInvokedMethod());
- if (isLibraryMethodReturningReceiver) {
+ if (libraryMethodsReturningReceiver.contains(invoke.getInvokedMethod())) {
if (checkArgumentType(invoke, invoke.getInvokedMethod(), 0)) {
invoke.outValue().replaceUsers(invoke.arguments().get(0));
invoke.setOutValue(null);
@@ -1554,11 +1556,18 @@
if (definition != null && definition.getOptimizationInfo().returnsArgument()) {
int argumentIndex = definition.getOptimizationInfo().getReturnedArgument();
// Replace the out value of the invoke with the argument and ignore the out value.
- if (argumentIndex != -1 && checkArgumentType(invoke, target.method,
- argumentIndex)) {
+ if (argumentIndex != -1
+ && checkArgumentType(invoke, target.method, argumentIndex)) {
Value argument = invoke.arguments().get(argumentIndex);
- assert invoke.outValue().verifyCompatible(argument.outType());
- invoke.outValue().replaceUsers(argument);
+ Value outValue = invoke.outValue();
+ assert outValue.verifyCompatible(argument.outType());
+ if (argument.getTypeLattice().lessThanOrEqual(
+ outValue.getTypeLattice(), appInfo)) {
+ needToNarrowValues.addAll(outValue.affectedValues());
+ } else {
+ needToWidenValues.addAll(outValue.affectedValues());
+ }
+ outValue.replaceUsers(argument);
invoke.setOutValue(null);
}
}
@@ -1567,6 +1576,17 @@
}
}
}
+ if (!needToWidenValues.isEmpty() || !needToNarrowValues.isEmpty()) {
+ TypeAnalysis analysis = new TypeAnalysis(appInfo, code.method);
+ // If out value of invoke < argument (e.g., losing non-null info), widen users type.
+ if (!needToWidenValues.isEmpty()) {
+ analysis.widening(needToWidenValues);
+ }
+ // Otherwise, i.e., argument has more precise types, narrow users type.
+ if (!needToNarrowValues.isEmpty()) {
+ analysis.narrowing(needToNarrowValues);
+ }
+ }
assert code.isConsistentGraph();
}
@@ -1726,7 +1746,7 @@
}
// Check if the static put is a constant derived from the class holding the method.
- // This checks for java.lang.Class.getName and java.lang.Class.getSimpleName.
+ // This checks for java.lang.Class.get*Name.
private boolean isClassNameConstantOf(DexClass clazz, StaticPut put) {
if (put.getField().type != dexItemFactory.stringType) {
return false;
@@ -1740,8 +1760,7 @@
private boolean isClassNameConstantOf(DexClass clazz, Instruction instruction) {
if (instruction.isInvokeVirtual()) {
InvokeVirtual invoke = instruction.asInvokeVirtual();
- if ((invoke.getInvokedMethod() == dexItemFactory.classMethods.getSimpleName
- || invoke.getInvokedMethod() == dexItemFactory.classMethods.getName)
+ if (dexItemFactory.classMethods.isReflectiveNameLookup(invoke.getInvokedMethod())
&& !invoke.inValues().get(0).isPhi()
&& invoke.inValues().get(0).definition.isConstClass()
&& invoke.inValues().get(0).definition.asConstClass().getValue() == clazz.type) {
@@ -1785,7 +1804,9 @@
} else if (inValue.isDexItemBasedConstString()) {
DexItemBasedConstString cnst =
inValue.getConstInstruction().asDexItemBasedConstString();
- encodedField.setStaticValue(new DexItemBasedValueString(cnst.getItem()));
+ assert !cnst.getClassNameComputationInfo().needsToComputeClassName();
+ encodedField.setStaticValue(
+ new DexItemBasedValueString(cnst.getItem(), cnst.getClassNameComputationInfo()));
} else {
assert false;
}
@@ -1886,6 +1907,9 @@
}
DexField field = put.getField();
if (clazz.definesStaticField(field)) {
+ if (put.inValue().isDexItemBasedConstStringThatNeedsToComputeClassName()) {
+ continue;
+ }
if (put.inValue().isConstant()) {
if ((field.type.isClassType() || field.type.isArrayType())
&& put.inValue().isZero()) {
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
index bad5456..be94302 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
@@ -16,6 +16,7 @@
import com.android.tools.r8.ir.code.InvokeStatic;
import com.android.tools.r8.ir.code.Value;
import com.android.tools.r8.ir.conversion.CallSiteInformation;
+import com.android.tools.r8.ir.conversion.IRConverter;
import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
import com.android.tools.r8.ir.optimize.Inliner.InlineeWithReason;
import com.android.tools.r8.ir.optimize.Inliner.Reason;
@@ -427,7 +428,8 @@
assert IteratorUtils.peekNext(blockIterator) == block;
// Kick off the tracker to add non-null IRs only to the inlinee blocks.
- new NonNullTracker(appView.appInfo())
+ new NonNullTracker(appView.appInfo(),
+ IRConverter.libraryMethodsReturningNonNull(appView.dexItemFactory()))
.addNonNullInPart(code, blockIterator, inlinee.blocks::contains);
assert !blockIterator.hasNext();
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
index 63d0242..3c27a60 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
@@ -647,7 +647,7 @@
context.accessFlags.unsetBridge();
}
- context.copyMetadataFromInlinee(target);
+ context.copyMetadata(target);
code.copyMetadataFromInlinee(inlinee.code);
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java b/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java
index 29c7979..b82c743 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java
@@ -178,7 +178,12 @@
DexEncodedMethod target = invoke.lookupSingleTarget(appInfo, callingContext);
if (target != null) {
if (target.getOptimizationInfo().neverReturnsNull() && invoke.outValue().canBeNull()) {
- invoke.outValue().markNeverNull();
+ Value knownToBeNonNullValue = invoke.outValue();
+ knownToBeNonNullValue.markNeverNull();
+ TypeLatticeElement typeLattice = knownToBeNonNullValue.getTypeLattice();
+ assert typeLattice.isNullable() && typeLattice.isReference();
+ knownToBeNonNullValue.narrowing(appInfo, typeLattice.asNonNullable());
+ affectedValues.addAll(knownToBeNonNullValue.affectedValues());
}
if (target.getOptimizationInfo().returnsConstant()) {
long constant = target.getOptimizationInfo().getReturnedConstant();
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java b/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java
index 77339e0..1e62c36 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java
@@ -7,6 +7,7 @@
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.ir.analysis.type.TypeAnalysis;
import com.android.tools.r8.ir.analysis.type.TypeLatticeElement;
import com.android.tools.r8.ir.code.BasicBlock;
@@ -34,9 +35,11 @@
public class NonNullTracker {
private final AppInfo appInfo;
+ private final Set<DexMethod> libraryMethodsReturningNonNull;
- public NonNullTracker(AppInfo appInfo) {
+ public NonNullTracker(AppInfo appInfo, Set<DexMethod> libraryMethodsReturningNonNull) {
this.appInfo = appInfo;
+ this.libraryMethodsReturningNonNull = libraryMethodsReturningNonNull;
}
@VisibleForTesting
@@ -76,102 +79,48 @@
public void addNonNullInPart(
IRCode code, ListIterator<BasicBlock> blockIterator, Predicate<BasicBlock> blockTester) {
Set<Value> affectedValues = Sets.newIdentityHashSet();
+ Set<Value> knownToBeNonNullValues = Sets.newIdentityHashSet();
while (blockIterator.hasNext()) {
BasicBlock block = blockIterator.next();
if (!blockTester.test(block)) {
continue;
}
- // Add non-null after instructions that implicitly indicate receiver/array is not null.
+ // Add non-null after
+ // 1) invocations that call non-overridable library methods that are known to return non null.
+ // 2) instructions that implicitly indicate receiver/array is not null.
+ // TODO(b/71500340): We can add non-null IRs for known-to-be-non-null parameters here.
InstructionListIterator iterator = block.listIterator();
while (iterator.hasNext()) {
Instruction current = iterator.next();
- if (!throwsOnNullInput(current)) {
- continue;
- }
- Value knownToBeNonNullValue = getNonNullInput(current);
- TypeLatticeElement typeLattice = knownToBeNonNullValue.getTypeLattice();
- // Avoid adding redundant non-null instruction.
- if (knownToBeNonNullValue.isNeverNull() || !isNonNullCandidate(typeLattice)) {
+ if (current.isInvokeMethod()
+ && libraryMethodsReturningNonNull.contains(
+ current.asInvokeMethod().getInvokedMethod())) {
+ Value knownToBeNonNullValue = current.outValue();
+ // Avoid adding redundant non-null instruction.
// Otherwise, we will have something like:
// non_null_rcv <- non-null(rcv)
// ...
// another_rcv <- non-null(non_null_rcv)
- continue;
- }
- // First, if the current block has catch handler, split into two blocks, e.g.,
- //
- // ...x
- // invoke(rcv, ...)
- // ...y
- //
- // ~>
- //
- // ...x
- // invoke(rcv, ...)
- // goto A
- //
- // A: ...y // blockWithNonNullInstruction
- boolean split = block.hasCatchHandlers();
- BasicBlock blockWithNonNullInstruction =
- split ? iterator.split(code, blockIterator) : block;
-
- // Find all users of the original value that are dominated by either the current block
- // or the new split-off block. Since NPE can be explicitly caught, nullness should be
- // propagated through dominance.
- Set<Instruction> users = knownToBeNonNullValue.uniqueUsers();
- Set<Instruction> dominatedUsers = Sets.newIdentityHashSet();
- Map<Phi, IntList> dominatedPhiUsersWithPositions = new IdentityHashMap<>();
- DominatorTree dominatorTree = new DominatorTree(code, MAY_HAVE_UNREACHABLE_BLOCKS);
- Set<BasicBlock> dominatedBlocks = Sets.newIdentityHashSet();
- for (BasicBlock dominatee : dominatorTree.dominatedBlocks(blockWithNonNullInstruction)) {
- dominatedBlocks.add(dominatee);
- InstructionListIterator dominateeIterator = dominatee.listIterator();
- if (dominatee == blockWithNonNullInstruction && !split) {
- // In the block where the non null instruction will be inserted, skip instructions up
- // to and including the insertion point.
- dominateeIterator.nextUntil(instruction -> instruction == current);
- }
- while (dominateeIterator.hasNext()) {
- Instruction potentialUser = dominateeIterator.next();
- if (users.contains(potentialUser)) {
- dominatedUsers.add(potentialUser);
- }
+ if (knownToBeNonNullValue != null && isNonNullCandidate(knownToBeNonNullValue)) {
+ knownToBeNonNullValues.add(knownToBeNonNullValue);
}
}
- for (Phi user : knownToBeNonNullValue.uniquePhiUsers()) {
- IntList dominatedPredecessorIndexes =
- findDominatedPredecessorIndexesInPhi(user, knownToBeNonNullValue, dominatedBlocks);
- if (!dominatedPredecessorIndexes.isEmpty()) {
- dominatedPhiUsersWithPositions.put(user, dominatedPredecessorIndexes);
+ if (throwsOnNullInput(current)) {
+ Value knownToBeNonNullValue = getNonNullInput(current);
+ if (isNonNullCandidate(knownToBeNonNullValue)) {
+ knownToBeNonNullValues.add(knownToBeNonNullValue);
}
}
-
- // Only insert non-null instruction if it is ever used.
- if (!dominatedUsers.isEmpty() || !dominatedPhiUsersWithPositions.isEmpty()) {
- // Add non-null fake IR, e.g.,
- // ...x
- // invoke(rcv, ...)
- // goto A
- // ...
- // A: non_null_rcv <- non-null(rcv)
- // ...y
- Value nonNullValue = code.createValue(
- typeLattice.asNonNullable(), knownToBeNonNullValue.getLocalInfo());
- affectedValues.addAll(knownToBeNonNullValue.affectedValues());
- NonNull nonNull = new NonNull(nonNullValue, knownToBeNonNullValue, current);
- nonNull.setPosition(current.getPosition());
- if (blockWithNonNullInstruction != block) {
- // If we split, add non-null IR on top of the new split block.
- blockWithNonNullInstruction.listIterator().add(nonNull);
- } else {
- // Otherwise, just add it to the current block at the position of the iterator.
- iterator.add(nonNull);
- }
-
- // Replace all users of the original value that are dominated by either the current
- // block or the new split-off block.
- knownToBeNonNullValue.replaceSelectiveUsers(
- nonNullValue, dominatedUsers, dominatedPhiUsersWithPositions);
+ if (!knownToBeNonNullValues.isEmpty()) {
+ addNonNullForValues(
+ code,
+ blockIterator,
+ block,
+ iterator,
+ current,
+ knownToBeNonNullValues,
+ affectedValues);
+ knownToBeNonNullValues.clear();
}
}
@@ -200,9 +149,8 @@
// ...
If theIf = block.exit().asIf();
Value knownToBeNonNullValue = theIf.inValues().get(0);
- TypeLatticeElement typeLattice = knownToBeNonNullValue.getTypeLattice();
- // Avoid adding redundant non-null instruction (or non-null of non-object types).
- if (!knownToBeNonNullValue.isNeverNull() && isNonNullCandidate(typeLattice)) {
+ // Avoid adding redundant non-null instruction.
+ if (isNonNullCandidate(knownToBeNonNullValue)) {
BasicBlock target = theIf.targetFromNonNullObject();
// Ignore uncommon empty blocks.
if (!target.isEmpty()) {
@@ -228,6 +176,7 @@
}
// Avoid adding a non-null for the value without meaningful users.
if (!dominatedUsers.isEmpty() || !dominatedPhiUsersWithPositions.isEmpty()) {
+ TypeLatticeElement typeLattice = knownToBeNonNullValue.getTypeLattice();
Value nonNullValue = code.createValue(
typeLattice.asNonNullable(), knownToBeNonNullValue.getLocalInfo());
affectedValues.addAll(knownToBeNonNullValue.affectedValues());
@@ -249,6 +198,93 @@
}
}
+ private void addNonNullForValues(
+ IRCode code,
+ ListIterator<BasicBlock> blockIterator,
+ BasicBlock block,
+ InstructionListIterator iterator,
+ Instruction current,
+ Set<Value> knownToBeNonNullValues,
+ Set<Value> affectedValues) {
+ // First, if the current block has catch handler, split into two blocks, e.g.,
+ //
+ // ...x
+ // invoke(rcv, ...)
+ // ...y
+ //
+ // ~>
+ //
+ // ...x
+ // invoke(rcv, ...)
+ // goto A
+ //
+ // A: ...y // blockWithNonNullInstruction
+ boolean split = block.hasCatchHandlers();
+ BasicBlock blockWithNonNullInstruction = split ? iterator.split(code, blockIterator) : block;
+ DominatorTree dominatorTree = new DominatorTree(code, MAY_HAVE_UNREACHABLE_BLOCKS);
+
+ for (Value knownToBeNonNullValue : knownToBeNonNullValues) {
+ // Find all users of the original value that are dominated by either the current block
+ // or the new split-off block. Since NPE can be explicitly caught, nullness should be
+ // propagated through dominance.
+ Set<Instruction> users = knownToBeNonNullValue.uniqueUsers();
+ Set<Instruction> dominatedUsers = Sets.newIdentityHashSet();
+ Map<Phi, IntList> dominatedPhiUsersWithPositions = new IdentityHashMap<>();
+ Set<BasicBlock> dominatedBlocks = Sets.newIdentityHashSet();
+ for (BasicBlock dominatee : dominatorTree.dominatedBlocks(blockWithNonNullInstruction)) {
+ dominatedBlocks.add(dominatee);
+ InstructionListIterator dominateeIterator = dominatee.listIterator();
+ if (dominatee == blockWithNonNullInstruction && !split) {
+ // In the block where the non null instruction will be inserted, skip instructions up to
+ // and including the insertion point.
+ dominateeIterator.nextUntil(instruction -> instruction == current);
+ }
+ while (dominateeIterator.hasNext()) {
+ Instruction potentialUser = dominateeIterator.next();
+ if (users.contains(potentialUser)) {
+ dominatedUsers.add(potentialUser);
+ }
+ }
+ }
+ for (Phi user : knownToBeNonNullValue.uniquePhiUsers()) {
+ IntList dominatedPredecessorIndexes =
+ findDominatedPredecessorIndexesInPhi(user, knownToBeNonNullValue, dominatedBlocks);
+ if (!dominatedPredecessorIndexes.isEmpty()) {
+ dominatedPhiUsersWithPositions.put(user, dominatedPredecessorIndexes);
+ }
+ }
+
+ // Only insert non-null instruction if it is ever used.
+ if (!dominatedUsers.isEmpty() || !dominatedPhiUsersWithPositions.isEmpty()) {
+ // Add non-null fake IR, e.g.,
+ // ...x
+ // invoke(rcv, ...)
+ // goto A
+ // ...
+ // A: non_null_rcv <- non-null(rcv)
+ // ...y
+ TypeLatticeElement typeLattice = knownToBeNonNullValue.getTypeLattice();
+ Value nonNullValue =
+ code.createValue(typeLattice.asNonNullable(), knownToBeNonNullValue.getLocalInfo());
+ affectedValues.addAll(knownToBeNonNullValue.affectedValues());
+ NonNull nonNull = new NonNull(nonNullValue, knownToBeNonNullValue, current);
+ nonNull.setPosition(current.getPosition());
+ if (blockWithNonNullInstruction != block) {
+ // If we split, add non-null IR on top of the new split block.
+ blockWithNonNullInstruction.listIterator().add(nonNull);
+ } else {
+ // Otherwise, just add it to the current block at the position of the iterator.
+ iterator.add(nonNull);
+ }
+
+ // Replace all users of the original value that are dominated by either the current block
+ // or the new split-off block.
+ knownToBeNonNullValue.replaceSelectiveUsers(
+ nonNullValue, dominatedUsers, dominatedPhiUsersWithPositions);
+ }
+ }
+ }
+
private IntList findDominatedPredecessorIndexesInPhi(
Phi user, Value knownToBeNonNullValue, Set<BasicBlock> dominatedBlocks) {
assert user.getOperands().contains(knownToBeNonNullValue);
@@ -274,10 +310,13 @@
return predecessorIndexes;
}
- private boolean isNonNullCandidate(TypeLatticeElement typeLattice) {
+ private boolean isNonNullCandidate(Value knownToBeNonNullValue) {
+ TypeLatticeElement typeLattice = knownToBeNonNullValue.getTypeLattice();
return
+ // redundant
+ !knownToBeNonNullValue.isNeverNull()
// v <- non-null NULL ?!
- !typeLattice.isNull()
+ && !typeLattice.isConstantNull()
// v <- non-null known-to-be-non-null // redundant
&& typeLattice.isNullable()
// e.g., v <- non-null INT ?!
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/ReflectionOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/ReflectionOptimizer.java
new file mode 100644
index 0000000..ecd3a7a
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/ir/optimize/ReflectionOptimizer.java
@@ -0,0 +1,117 @@
+// Copyright (c) 2018, 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.ir.optimize;
+
+import static com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor;
+import static com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor;
+import static com.android.tools.r8.utils.DescriptorUtils.getSimpleClassNameFromDescriptor;
+
+import com.android.tools.r8.errors.Unreachable;
+import com.android.tools.r8.graph.DexClass;
+import com.android.tools.r8.graph.DexString;
+import com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo.ClassNameComputationOption;
+import com.google.common.base.Strings;
+
+public class ReflectionOptimizer {
+
+ public static class ClassNameComputationInfo {
+ public enum ClassNameComputationOption {
+ NONE,
+ NAME, // getName()
+ TYPE_NAME, // getTypeName()
+ CANONICAL_NAME, // getCanonicalName()
+ SIMPLE_NAME; // getSimpleName()
+
+ boolean needsToComputeClassName() {
+ return this != NONE;
+ }
+
+ boolean needsToRegisterTypeReference() {
+ return this == SIMPLE_NAME;
+ }
+ }
+
+ private static final ClassNameComputationInfo DEFAULT_INSTANCE =
+ new ClassNameComputationInfo(ClassNameComputationOption.NONE, 0);
+
+ final ClassNameComputationOption classNameComputationOption;
+ final int arrayDepth;
+
+ public ClassNameComputationInfo(
+ ClassNameComputationOption classNameComputationOption, int arrayDepth) {
+ this.classNameComputationOption = classNameComputationOption;
+ this.arrayDepth = arrayDepth;
+ }
+
+ public static ClassNameComputationInfo none() {
+ return DEFAULT_INSTANCE;
+ }
+
+ public boolean needsToComputeClassName() {
+ return classNameComputationOption.needsToComputeClassName();
+ }
+
+ public boolean needsToRegisterTypeReference() {
+ return classNameComputationOption.needsToRegisterTypeReference();
+ }
+ }
+
+ public static String computeClassName(
+ DexString descriptor, DexClass holder, ClassNameComputationInfo classNameComputationInfo) {
+ return computeClassName(
+ descriptor.toString(),
+ holder,
+ classNameComputationInfo.classNameComputationOption,
+ classNameComputationInfo.arrayDepth);
+ }
+
+ public static String computeClassName(
+ String descriptor,
+ DexClass holder,
+ ClassNameComputationOption classNameComputationOption,
+ int arrayDepth) {
+ String name;
+ switch (classNameComputationOption) {
+ case NAME:
+ name = getClassNameFromDescriptor(descriptor);
+ if (arrayDepth > 0) {
+ name = Strings.repeat("[", arrayDepth) + "L" + name + ";";
+ }
+ break;
+ case TYPE_NAME:
+ // TODO(b/119426668): desugar Type#getTypeName
+ throw new Unreachable("Type#getTypeName not supported yet");
+ // name = getClassNameFromDescriptor(descriptor);
+ // if (arrayDepth > 0) {
+ // name = name + Strings.repeat("[]", arrayDepth);
+ // }
+ // break;
+ case CANONICAL_NAME:
+ name = getCanonicalNameFromDescriptor(descriptor);
+ if (arrayDepth > 0) {
+ name = name + Strings.repeat("[]", arrayDepth);
+ }
+ break;
+ case SIMPLE_NAME:
+ assert holder != null;
+ boolean renamed = !descriptor.equals(holder.type.toDescriptorString());
+ boolean needsToRetrieveInnerName = holder.isMemberClass() || holder.isLocalClass();
+ if (!renamed && needsToRetrieveInnerName) {
+ name = holder.getInnerClassAttributeForThisClass().getInnerName().toString();
+ } else {
+ name = getSimpleClassNameFromDescriptor(descriptor);
+ }
+ if (arrayDepth > 0) {
+ name = name + Strings.repeat("[]", arrayDepth);
+ }
+ break;
+ default:
+ throw new Unreachable(
+ "Unexpected ClassNameComputationOption: '" + classNameComputationOption + "'");
+ }
+ return name;
+ }
+
+
+}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java b/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java
index a55015d..3ba9289 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java
@@ -249,8 +249,10 @@
instructionIterator.previous();
// Unlink all blocks that are dominated by successor.
- DominatorTree dominatorTree = new DominatorTree(code, MAY_HAVE_UNREACHABLE_BLOCKS);
- blocksToBeRemoved.addAll(block.unlink(normalSuccessorBlock, dominatorTree));
+ {
+ DominatorTree dominatorTree = new DominatorTree(code, MAY_HAVE_UNREACHABLE_BLOCKS);
+ blocksToBeRemoved.addAll(block.unlink(normalSuccessorBlock, dominatorTree));
+ }
// Insert constant null before the instruction.
instructionIterator.previous();
@@ -284,6 +286,9 @@
return;
}
if (!appView.dexItemFactory().npeType.isSubtypeOf(guard, appView.appInfo())) {
+ // TODO(christofferqa): Consider updating previous dominator tree instead of
+ // rebuilding it from scratch.
+ DominatorTree dominatorTree = new DominatorTree(code, MAY_HAVE_UNREACHABLE_BLOCKS);
blocksToBeRemoved.addAll(block.unlink(target, dominatorTree));
}
});
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/lambda/LambdaMerger.java b/src/main/java/com/android/tools/r8/ir/optimize/lambda/LambdaMerger.java
index 68eb269..50d22e1 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/lambda/LambdaMerger.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/lambda/LambdaMerger.java
@@ -307,9 +307,11 @@
.sorted(DexEncodedMethod::slowCompare)
.collect(Collectors.toList());
for (DexEncodedMethod method : methods) {
- converter.processMethod(method, feedback,
+ DexEncodedMethod mappedMethod =
+ converter.graphLense().mapDexEncodedMethod(converter.appInfo, method);
+ converter.processMethod(mappedMethod, feedback,
x -> false, CallSiteInformation.empty(), Outliner::noProcessing);
- assert method.isProcessed();
+ assert mappedMethod.isProcessed();
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java
index 093ac43..7eb9624 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java
@@ -20,6 +20,7 @@
import com.android.tools.r8.ir.code.InstructionIterator;
import com.android.tools.r8.ir.code.InvokeMethodWithReceiver;
import com.android.tools.r8.ir.code.InvokeStatic;
+import com.android.tools.r8.ir.code.Phi;
import com.android.tools.r8.ir.code.StaticGet;
import com.android.tools.r8.ir.code.StaticPut;
import com.android.tools.r8.ir.code.Value;
@@ -34,6 +35,7 @@
import com.google.common.collect.Streams;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
@@ -237,7 +239,7 @@
}
private void removeReferencesToThis(DexEncodedMethod method, IRCode code) {
- fixupStaticizedValueUsers(code, code.getThis());
+ fixupStaticizedThisUsers(code, code.getThis());
}
private void rewriteReferences(DexEncodedMethod method, IRCode code) {
@@ -250,11 +252,12 @@
.collect(Collectors.toList());
singletonFieldReads.forEach(read -> {
- CandidateInfo candidateInfo = singletonFields.get(read.getField());
+ DexField field = read.getField();
+ CandidateInfo candidateInfo = singletonFields.get(field);
assert candidateInfo != null;
Value value = read.dest();
if (value != null) {
- fixupStaticizedValueUsers(code, value);
+ fixupStaticizedFieldReadUsers(code, value, field);
}
if (!candidateInfo.preserveRead.get()) {
read.removeOrReplaceByDebugLocalRead();
@@ -266,12 +269,116 @@
}
}
- // Fixup value usages: rewrites all method calls so that they point to static methods.
- private void fixupStaticizedValueUsers(IRCode code, Value thisValue) {
+ // Fixup `this` usages: rewrites all method calls so that they point to static methods.
+ private void fixupStaticizedThisUsers(IRCode code, Value thisValue) {
assert thisValue != null;
assert thisValue.numberOfPhiUsers() == 0;
- for (Instruction user : thisValue.uniqueUsers()) {
+ fixupStaticizedValueUsers(code, thisValue.uniqueUsers());
+
+ assert thisValue.numberOfUsers() == 0;
+ }
+
+ // Re-processing finalized code may create slightly different IR code than what the examining
+ // phase has seen. For example,
+ //
+ // b1:
+ // s1 <- static-get singleton
+ // ...
+ // invoke-virtual { s1, ... } mtd1
+ // goto Exit
+ // b2:
+ // s2 <- static-get singleoton
+ // ...
+ // invoke-virtual { s2, ... } mtd1
+ // goto Exit
+ // ...
+ // Exit: ...
+ //
+ // ~>
+ //
+ // b1:
+ // s1 <- static-get singleton
+ // ...
+ // goto Exit
+ // b2:
+ // s2 <- static-get singleton
+ // ...
+ // goto Exit
+ // Exit:
+ // sp <- phi(s1, s2)
+ // invoke-virtual { sp, ... } mtd1
+ // ...
+ //
+ // From staticizer's viewpoint, `sp` is trivial in the sense that it is composed of values that
+ // refer to the same singleton field. If so, we can safely relax the assertion; remove uses of
+ // field reads; remove quasi-trivial phis; and then remove original field reads.
+ private boolean testAndcollectPhisComposedOfSameFieldRead(
+ Set<Phi> phisToCheck, DexField field, Set<Phi> trivialPhis) {
+ for (Phi phi : phisToCheck) {
+ Set<Phi> chainedPhis = Sets.newIdentityHashSet();
+ for (Value operand : phi.getOperands()) {
+ if (operand.isPhi()) {
+ chainedPhis.add(operand.asPhi());
+ } else {
+ if (!operand.definition.isStaticGet()) {
+ return false;
+ }
+ if (operand.definition.asStaticGet().getField() != field) {
+ return false;
+ }
+ }
+ }
+ if (!chainedPhis.isEmpty()) {
+ if (!testAndcollectPhisComposedOfSameFieldRead(chainedPhis, field, trivialPhis)) {
+ return false;
+ }
+ }
+ trivialPhis.add(phi);
+ }
+ return true;
+ }
+
+ // Fixup field read usages. Same as {@link #fixupStaticizedThisUsers} except this one is handling
+ // quasi-trivial phis that might be introduced while re-processing finalized code.
+ private void fixupStaticizedFieldReadUsers(IRCode code, Value dest, DexField field) {
+ assert dest != null;
+ // During the examine phase, field reads with any phi users have been invalidated, hence zero.
+ // However, it may be not true if re-processing introduces phis after optimizing common suffix.
+ Set<Phi> trivialPhis = Sets.newIdentityHashSet();
+ boolean hasTrivialPhis =
+ testAndcollectPhisComposedOfSameFieldRead(dest.uniquePhiUsers(), field, trivialPhis);
+ assert dest.numberOfPhiUsers() == 0 || hasTrivialPhis;
+ Set<Instruction> users = new HashSet<>(dest.uniqueUsers());
+ // If that is the case, method calls we want to fix up include users of those phis.
+ if (hasTrivialPhis) {
+ for (Phi phi : trivialPhis) {
+ users.addAll(phi.uniqueUsers());
+ }
+ }
+
+ fixupStaticizedValueUsers(code, users);
+
+ if (hasTrivialPhis) {
+ // We can't directly use Phi#removeTrivialPhi because they still refer to different operands.
+ for (Phi phi : trivialPhis) {
+ // First, make sure phi users are indeed uses of field reads and removed via fixup.
+ assert phi.numberOfUsers() == 0;
+ // Then, manually clean up this from all of the operands.
+ for (Value operand : phi.getOperands()) {
+ operand.removePhiUser(phi);
+ }
+ // And remove it from the containing block.
+ phi.getBlock().removePhi(phi);
+ }
+ }
+
+ // No matter what, number of phi users should be zero too.
+ assert dest.numberOfUsers() == 0 && dest.numberOfPhiUsers() == 0;
+ }
+
+ private void fixupStaticizedValueUsers(IRCode code, Set<Instruction> users) {
+ for (Instruction user : users) {
assert user.isInvokeVirtual() || user.isInvokeDirect();
InvokeMethodWithReceiver invoke = user.asInvokeMethodWithReceiver();
Value newValue = null;
@@ -287,8 +394,6 @@
invoke.replace(new InvokeStatic(
invoke.getInvokedMethod(), newValue, args.subList(1, args.size())));
}
-
- assert thisValue.numberOfUsers() == 0;
}
private void remapMovedCandidates(IRCode code) {
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 9fec63a..782951d 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
@@ -4,9 +4,10 @@
package com.android.tools.r8.ir.optimize.string;
import static com.android.tools.r8.ir.optimize.CodeRewriter.removeOrReplaceByDebugLocalWrite;
-import static com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor;
-import static com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor;
-import static com.android.tools.r8.utils.DescriptorUtils.getSimpleClassNameFromDescriptor;
+import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo.ClassNameComputationOption.CANONICAL_NAME;
+import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo.ClassNameComputationOption.NAME;
+import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo.ClassNameComputationOption.SIMPLE_NAME;
+import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.computeClassName;
import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.DexClass;
@@ -18,20 +19,21 @@
import com.android.tools.r8.ir.code.ConstClass;
import com.android.tools.r8.ir.code.ConstNumber;
import com.android.tools.r8.ir.code.ConstString;
+import com.android.tools.r8.ir.code.DexItemBasedConstString;
import com.android.tools.r8.ir.code.IRCode;
import com.android.tools.r8.ir.code.Instruction;
import com.android.tools.r8.ir.code.InstructionIterator;
import com.android.tools.r8.ir.code.InvokeStatic;
import com.android.tools.r8.ir.code.InvokeVirtual;
import com.android.tools.r8.ir.code.Value;
+import com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo;
import com.android.tools.r8.utils.InternalOptions;
-import com.google.common.base.Strings;
import java.util.function.BiFunction;
import java.util.function.Function;
public class StringOptimizer {
- final ThrowingInfo throwingInfo;
+ private final ThrowingInfo throwingInfo;
public StringOptimizer(InternalOptions options) {
throwingInfo = options.isGeneratingClassFiles()
@@ -43,6 +45,9 @@
// boolean String#startsWith(str)
// boolean String#endsWith(str)
// boolean String#contains(str)
+ // boolean String#equals(str)
+ // boolean String#equalsIgnoreCase(str)
+ // boolean String#contentEquals(str)
public void computeTrivialOperationsOnConstString(IRCode code, DexItemFactory factory) {
if (!code.hasConstString) {
return;
@@ -67,6 +72,12 @@
operatorWithString = (rcv, arg) -> rcv.startsWith(arg) ? 1 : 0;
} else if (invokedMethod == factory.stringMethods.endsWith) {
operatorWithString = (rcv, arg) -> rcv.endsWith(arg) ? 1 : 0;
+ } else if (invokedMethod == factory.stringMethods.equals) {
+ operatorWithString = (rcv, arg) -> rcv.equals(arg) ? 1 : 0;
+ } else if (invokedMethod == factory.stringMethods.equalsIgnoreCase) {
+ operatorWithString = (rcv, arg) -> rcv.equalsIgnoreCase(arg) ? 1 : 0;
+ } else if (invokedMethod == factory.stringMethods.contentEqualsCharSequence) {
+ operatorWithString = (rcv, arg) -> rcv.contentEquals(arg) ? 1 : 0;
}
if (operatorWithNoArg == null && operatorWithString == null) {
continue;
@@ -104,6 +115,7 @@
// Find Class#get*Name() with a constant-class and replace it with a const-string if possible.
public void rewriteClassGetName(IRCode code, AppInfo appInfo) {
+ boolean markUseIdentifierNameString = false;
InstructionIterator it = code.instructionIterator();
while (it.hasNext()) {
Instruction instr = it.next();
@@ -147,29 +159,18 @@
continue;
}
+ DexItemBasedConstString deferred = null;
String name = null;
if (invokedMethod == appInfo.dexItemFactory.classMethods.getName) {
if (code.options.enableMinification) {
- // TODO(b/118536394): Add support minification and pinning.
- // May need store array depth on DexItemBasedConstString.
- // May need enum on DexItemBasedConstString to distinguish name computation.
- continue;
- }
- name = getClassNameFromDescriptor(baseType.toDescriptorString());
- if (arrayDepth > 0) {
- name = Strings.repeat("[", arrayDepth) + "L" + name + ";";
+ deferred = new DexItemBasedConstString(
+ invoke.outValue(), baseType, new ClassNameComputationInfo(NAME, arrayDepth));
+ } else {
+ name = computeClassName(baseType.toDescriptorString(), holder, NAME, arrayDepth);
}
} else if (invokedMethod == appInfo.dexItemFactory.classMethods.getTypeName) {
// TODO(b/119426668): desugar Type#getTypeName
continue;
- // if (code.options.enableMinification) {
- // // TODO(b/118536394): Add support minification and pinning.
- // continue;
- // }
- // name = getClassNameFromDescriptor(baseType.toDescriptorString());
- // if (arrayDepth > 0) {
- // name = name + Strings.repeat("[]", arrayDepth);
- // }
} else if (invokedMethod == appInfo.dexItemFactory.classMethods.getCanonicalName) {
// Always returns null if the target type is local or anonymous class.
if (holder.isLocalClass() || holder.isAnonymousClass()) {
@@ -177,12 +178,14 @@
it.replaceCurrentInstruction(constNull);
} else {
if (code.options.enableMinification) {
- // TODO(b/118536394): Add support minification and pinning.
- continue;
- }
- name = getCanonicalNameFromDescriptor(baseType.toDescriptorString());
- if (arrayDepth > 0) {
- name = name + Strings.repeat("[]", arrayDepth);
+ deferred =
+ new DexItemBasedConstString(
+ invoke.outValue(),
+ baseType,
+ new ClassNameComputationInfo(CANONICAL_NAME, arrayDepth));
+ } else {
+ name = computeClassName(
+ baseType.toDescriptorString(), holder, CANONICAL_NAME, arrayDepth);
}
}
} else if (invokedMethod == appInfo.dexItemFactory.classMethods.getSimpleName) {
@@ -191,16 +194,10 @@
name = "";
} else {
if (code.options.enableMinification) {
- // TODO(b/118536394): Add support minification and pinning.
- continue;
- }
- if (holder.isMemberClass() || holder.isLocalClass()) {
- name = holder.getInnerClassAttributeForThisClass().getInnerName().toString();
+ deferred = new DexItemBasedConstString(
+ invoke.outValue(), baseType, new ClassNameComputationInfo(SIMPLE_NAME, arrayDepth));
} else {
- name = getSimpleClassNameFromDescriptor(baseType.toDescriptorString());
- }
- if (arrayDepth > 0) {
- name = name + Strings.repeat("[]", arrayDepth);
+ name = computeClassName(baseType.toDescriptorString(), holder, SIMPLE_NAME, arrayDepth);
}
}
}
@@ -210,8 +207,14 @@
ConstString constString =
new ConstString(stringValue, appInfo.dexItemFactory.createString(name), throwingInfo);
it.replaceCurrentInstruction(constString);
+ } else if (deferred != null) {
+ it.replaceCurrentInstruction(deferred);
+ markUseIdentifierNameString = true;
}
}
+ if (markUseIdentifierNameString) {
+ code.method.getMutableOptimizationInfo().markUseIdentifierNameString();
+ }
}
// String#valueOf(null) -> "null"
diff --git a/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java b/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java
index 6928d3e..61695f1 100644
--- a/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java
+++ b/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.naming;
+import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.computeClassName;
import static com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType;
import com.android.tools.r8.cf.code.CfConstString;
@@ -23,7 +24,6 @@
import com.android.tools.r8.graph.DexValue.DexValueString;
import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
import com.android.tools.r8.shaking.ProguardClassFilter;
-import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
import java.util.List;
import java.util.Map;
@@ -36,23 +36,19 @@
private final AppInfoWithLiveness appInfo;
private final ProguardClassFilter adaptClassStrings;
private final NamingLens lens;
- private final Object2BooleanMap<DexReference> identifierNameStrings;
IdentifierMinifier(
AppInfoWithLiveness appInfo, ProguardClassFilter adaptClassStrings, NamingLens lens) {
this.appInfo = appInfo;
this.adaptClassStrings = adaptClassStrings;
this.lens = lens;
- this.identifierNameStrings = appInfo.identifierNameStrings;
}
void run() {
if (!adaptClassStrings.isEmpty()) {
adaptClassStrings();
}
- if (!identifierNameStrings.isEmpty()) {
- replaceIdentifierNameString();
- }
+ replaceDexItemBasedConstString();
}
private void adaptClassStrings() {
@@ -120,28 +116,35 @@
return originalLiteral;
}
- // TODO(christofferqa): Rename to replaceDexItemBasedConstString.
- private void replaceIdentifierNameString() {
+ private void replaceDexItemBasedConstString() {
for (DexProgramClass clazz : appInfo.classes()) {
// Some const strings could be moved to field's static value (from <clinit>).
for (DexEncodedField field : clazz.staticFields()) {
- replaceIdentifierNameStringInStaticField(field);
+ replaceDexItemBasedConstStringInStaticField(field);
}
- clazz.forEachMethod(this::replaceIdentifierNameStringInMethod);
+ clazz.forEachMethod(this::replaceDexItemBasedConstStringInMethod);
}
}
- private void replaceIdentifierNameStringInStaticField(DexEncodedField encodedField) {
+ private void replaceDexItemBasedConstStringInStaticField(DexEncodedField encodedField) {
assert encodedField.accessFlags.isStatic();
DexValue staticValue = encodedField.getStaticValue();
if (staticValue instanceof DexItemBasedValueString) {
- DexReference original = ((DexItemBasedValueString) staticValue).getValue();
- encodedField.setStaticValue(
- new DexValueString(lens.lookupName(original, appInfo.dexItemFactory)));
+ DexItemBasedValueString dexItemBasedValueString = (DexItemBasedValueString) staticValue;
+ DexReference original = dexItemBasedValueString.getValue();
+ DexString replacement =
+ dexItemBasedValueString.getClassNameComputationInfo().needsToComputeClassName()
+ ? appInfo.dexItemFactory.createString(
+ computeClassName(
+ lens.lookupDescriptor(original.asDexType()),
+ appInfo.definitionFor(original.asDexType()),
+ dexItemBasedValueString.getClassNameComputationInfo()))
+ : lens.lookupName(original, appInfo.dexItemFactory);
+ encodedField.setStaticValue(new DexValueString(replacement));
}
}
- private void replaceIdentifierNameStringInMethod(DexEncodedMethod encodedMethod) {
+ private void replaceDexItemBasedConstStringInMethod(DexEncodedMethod encodedMethod) {
if (!encodedMethod.getOptimizationInfo().useIdentifierNameString()) {
return;
}
@@ -159,8 +162,15 @@
Instruction instruction = instructions[i];
if (instruction instanceof DexItemBasedConstString) {
DexItemBasedConstString cnst = instruction.asDexItemBasedConstString();
- instructions[i] =
- new ConstString(cnst.AA, lens.lookupName(cnst.getItem(), appInfo.dexItemFactory));
+ DexString replacement =
+ cnst.getClassNameComputationInfo().needsToComputeClassName()
+ ? appInfo.dexItemFactory.createString(
+ computeClassName(
+ lens.lookupDescriptor(cnst.getItem().asDexType()),
+ appInfo.definitionFor(cnst.getItem().asDexType()),
+ cnst.getClassNameComputationInfo()))
+ : lens.lookupName(cnst.getItem(), appInfo.dexItemFactory);
+ instructions[i] = new ConstString(cnst.AA, replacement);
}
}
} else {
@@ -170,8 +180,15 @@
CfInstruction instruction = instructions.get(i);
if (instruction.isDexItemBasedConstString()) {
CfDexItemBasedConstString cnst = instruction.asDexItemBasedConstString();
- instructions.set(
- i, new CfConstString(lens.lookupName(cnst.getItem(), appInfo.dexItemFactory)));
+ DexString replacement =
+ cnst.getClassNameComputationInfo().needsToComputeClassName()
+ ? appInfo.dexItemFactory.createString(
+ computeClassName(
+ lens.lookupDescriptor(cnst.getItem().asDexType()),
+ appInfo.definitionFor(cnst.getItem().asDexType()),
+ cnst.getClassNameComputationInfo()))
+ : lens.lookupName(cnst.getItem(), appInfo.dexItemFactory);
+ instructions.set(i, new CfConstString(replacement));
}
}
}
diff --git a/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java b/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java
index 1f5b0b1..d626407 100644
--- a/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java
+++ b/src/main/java/com/android/tools/r8/shaking/AnnotationRemover.java
@@ -21,13 +21,10 @@
private final AppInfoWithLiveness appInfo;
private final ProguardKeepAttributes keep;
private final InternalOptions options;
- private final ProguardConfiguration.Builder compatibility;
- public AnnotationRemover(AppInfoWithLiveness appInfo,
- ProguardConfiguration.Builder compatibility, InternalOptions options) {
+ public AnnotationRemover(AppInfoWithLiveness appInfo, InternalOptions options) {
this.appInfo = appInfo;
this.keep = options.proguardConfiguration.getKeepAttributes();
- this.compatibility = compatibility;
this.options = options;
}
@@ -128,8 +125,12 @@
return isAnnotationTypeLive(annotation);
}
- public void run() {
+ public AnnotationRemover ensureValid(ProguardConfiguration.Builder compatibility) {
keep.ensureValid(options.forceProguardCompatibility, compatibility);
+ return this;
+ }
+
+ public void run() {
for (DexProgramClass clazz : appInfo.classes()) {
stripAttributes(clazz);
clazz.annotations = clazz.annotations.keepIf(this::filterAnnotations);
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 fc10fe9..a9f5a71 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -862,20 +862,24 @@
}
}
- private void markMethodAsTargeted(DexEncodedMethod encodedMethod, KeepReason reason) {
- markTypeAsLive(encodedMethod.method.holder);
- markParameterAndReturnTypesAsLive(encodedMethod);
- if (Log.ENABLED) {
- Log.verbose(getClass(), "Method `%s` is targeted.", encodedMethod.method);
+ private void markMethodAsTargeted(DexEncodedMethod method, KeepReason reason) {
+ if (!targetedMethods.add(method, reason)) {
+ return;
}
- targetedMethods.add(encodedMethod, reason);
+ markTypeAsLive(method.method.holder);
+ markParameterAndReturnTypesAsLive(method);
+ processAnnotations(method.annotations.annotations);
+ method.parameterAnnotationsList.forEachAnnotation(this::processAnnotation);
+ if (Log.ENABLED) {
+ Log.verbose(getClass(), "Method `%s` is targeted.", method.method);
+ }
if (forceProguardCompatibility) {
// Keep targeted default methods in compatibility mode. The tree pruner will otherwise make
// these methods abstract, whereas Proguard does not (seem to) touch their code.
- DexClass clazz = appInfo.definitionFor(encodedMethod.method.holder);
- if (!encodedMethod.accessFlags.isAbstract()
+ DexClass clazz = appInfo.definitionFor(method.method.holder);
+ if (!method.accessFlags.isAbstract()
&& clazz.isInterface() && !clazz.isLibraryClass()) {
- markMethodAsKeptWithCompatRule(encodedMethod);
+ markMethodAsKeptWithCompatRule(method);
}
}
}
@@ -1392,6 +1396,7 @@
ConsequentRootSet consequentRootSet = ifRuleEvaluator.run(liveTypes);
enqueueRootItems(consequentRootSet.noShrinking);
rootSet.neverInline.addAll(consequentRootSet.neverInline);
+ rootSet.neverClassInline.addAll(consequentRootSet.neverClassInline);
rootSet.noOptimization.addAll(consequentRootSet.noOptimization);
rootSet.noObfuscation.addAll(consequentRootSet.noObfuscation);
rootSet.addDependentItems(consequentRootSet.dependentNoShrinking);
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardIfRule.java b/src/main/java/com/android/tools/r8/shaking/ProguardIfRule.java
index 3011951..8d68d2e 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardIfRule.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardIfRule.java
@@ -5,6 +5,7 @@
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.position.Position;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import java.util.List;
import java.util.stream.Collectors;
@@ -87,6 +88,24 @@
subsequentRule.materialize());
}
+ protected ClassInlineRule neverClassInlineRuleForCondition() {
+ return new ClassInlineRule(
+ Origin.unknown(),
+ Position.UNKNOWN,
+ null,
+ getClassAnnotation() == null ? null : getClassAnnotation().materialize(),
+ getClassAccessFlags(),
+ getNegatedClassAccessFlags(),
+ getClassTypeNegated(),
+ getClassType(),
+ getClassNames().materialize(),
+ getInheritanceAnnotation() == null ? null : getInheritanceAnnotation().materialize(),
+ getInheritanceClassName() == null ? null : getInheritanceClassName().materialize(),
+ getInheritanceIsExtends(),
+ ImmutableList.of(),
+ ClassInlineRule.Type.NEVER);
+ }
+
/**
* Consider the following rule, which requests that class Y should be kept if the method X.m() is
* in the final output.
diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java b/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
index c59081e..de0537f 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
@@ -327,7 +327,12 @@
application.timing.end();
}
return new ConsequentRootSet(
- neverInline, noShrinking, noOptimization, noObfuscation, dependentNoShrinking);
+ neverInline,
+ neverClassInline,
+ noShrinking,
+ noOptimization,
+ noObfuscation,
+ dependentNoShrinking);
}
/**
@@ -413,6 +418,14 @@
private void materializeIfRule(ProguardIfRule rule) {
ProguardIfRule materializedRule = rule.materialize();
+ // We need to abort class inlining of classes that could be matched by the condition of this
+ // -if rule.
+ ClassInlineRule neverClassInlineRuleForCondition =
+ materializedRule.neverClassInlineRuleForCondition();
+ if (neverClassInlineRuleForCondition != null) {
+ runPerRule(executorService, futures, neverClassInlineRuleForCondition, materializedRule);
+ }
+
// If the condition of the -if rule has any members, then we need to keep these members to
// ensure that the subsequent rule will be applied again in the second round of tree
// shaking.
@@ -957,7 +970,7 @@
this.alwaysInline = Collections.unmodifiableSet(alwaysInline);
this.forceInline = Collections.unmodifiableSet(forceInline);
this.neverInline = neverInline;
- this.neverClassInline = Collections.unmodifiableSet(neverClassInline);
+ this.neverClassInline = neverClassInline;
this.neverMerge = Collections.unmodifiableSet(neverMerge);
this.noSideEffects = Collections.unmodifiableMap(noSideEffects);
this.assumedValues = Collections.unmodifiableMap(assumedValues);
@@ -1010,6 +1023,7 @@
// A partial RootSet that becomes live due to the enabled -if rule.
static class ConsequentRootSet {
final Set<DexMethod> neverInline;
+ final Set<DexType> neverClassInline;
final Map<DexDefinition, ProguardKeepRule> noShrinking;
final Set<DexDefinition> noOptimization;
final Set<DexDefinition> noObfuscation;
@@ -1017,11 +1031,13 @@
private ConsequentRootSet(
Set<DexMethod> neverInline,
+ Set<DexType> neverClassInline,
Map<DexDefinition, ProguardKeepRule> noShrinking,
Set<DexDefinition> noOptimization,
Set<DexDefinition> noObfuscation,
Map<DexDefinition, Map<DexDefinition, ProguardKeepRule>> dependentNoShrinking) {
this.neverInline = Collections.unmodifiableSet(neverInline);
+ this.neverClassInline = Collections.unmodifiableSet(neverClassInline);
this.noShrinking = Collections.unmodifiableMap(noShrinking);
this.noOptimization = Collections.unmodifiableSet(noOptimization);
this.noObfuscation = Collections.unmodifiableSet(noObfuscation);
diff --git a/src/main/java/com/android/tools/r8/utils/ArchiveBuilder.java b/src/main/java/com/android/tools/r8/utils/ArchiveBuilder.java
index 4111bed..69d65ea 100644
--- a/src/main/java/com/android/tools/r8/utils/ArchiveBuilder.java
+++ b/src/main/java/com/android/tools/r8/utils/ArchiveBuilder.java
@@ -17,6 +17,10 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipOutputStream;
@@ -27,6 +31,9 @@
private ZipOutputStream stream = null;
private boolean closed = false;
private int openCount = 0;
+ private int classesFileIndex = 0;
+ private Map<Integer, DelayedData> delayedClassesDexFiles = new HashMap<>();
+ private SortedSet<DelayedData> delayedWrites = new TreeSet<>();
public ArchiveBuilder(Path archive) {
this.archive = archive;
@@ -44,6 +51,7 @@
assert !closed;
openCount--;
if (openCount == 0) {
+ writeDelayed(handler);
closed = true;
try {
getStreamRaw().close();
@@ -54,6 +62,20 @@
}
}
+ private void writeDelayed(DiagnosticsHandler handler) {
+ // We should never have any indexed files at this point
+ assert delayedClassesDexFiles.isEmpty();
+ for (DelayedData data : delayedWrites) {
+ if (data.isDirectory) {
+ assert data.content == null;
+ writeDirectoryNow(data.name, handler);
+ } else {
+ assert data.content != null;
+ writeFileNow(data.name, data.content, handler);
+ }
+ }
+ }
+
private ZipOutputStream getStreamRaw() throws IOException {
if (stream != null) {
return stream;
@@ -85,7 +107,11 @@
}
@Override
- public void addDirectory(String name, DiagnosticsHandler handler) {
+ public synchronized void addDirectory(String name, DiagnosticsHandler handler) {
+ delayedWrites.add(DelayedData.createDirectory(name));
+ }
+
+ private void writeDirectoryNow(String name, DiagnosticsHandler handler) {
if (name.charAt(name.length() - 1) != DataResource.SEPARATOR) {
name += DataResource.SEPARATOR;
}
@@ -105,7 +131,10 @@
@Override
public void addFile(String name, DataEntryResource content, DiagnosticsHandler handler) {
try (InputStream in = content.getByteStream()) {
- addFile(name, ByteDataView.of(ByteStreams.toByteArray(in)), handler);
+ ByteDataView view = ByteDataView.of(ByteStreams.toByteArray(in));
+ synchronized (this) {
+ delayedWrites.add(DelayedData.createFile(name, view));
+ }
} catch (IOException e) {
handleIOException(e, handler);
} catch (ResourceException e) {
@@ -116,6 +145,10 @@
@Override
public synchronized void addFile(String name, ByteDataView content, DiagnosticsHandler handler) {
+ delayedWrites.add(DelayedData.createFile(name, ByteDataView.of(content.copyByteData())));
+ }
+
+ private void writeFileNow(String name, ByteDataView content, DiagnosticsHandler handler) {
try {
ZipUtils.writeToZipStream(getStream(handler), name, content, ZipEntry.STORED);
} catch (IOException e) {
@@ -123,6 +156,30 @@
}
}
+ private void writeNextIfAvailable(DiagnosticsHandler handler) {
+ DelayedData data = delayedClassesDexFiles.remove(classesFileIndex);
+ while (data != null) {
+ writeFileNow(data.name, data.content, handler);
+ classesFileIndex++;
+ data = delayedClassesDexFiles.remove(classesFileIndex);
+ }
+ }
+
+ @Override
+ public synchronized void addIndexedClassFile(
+ int index, String name, ByteDataView content, DiagnosticsHandler handler) {
+ if (index == classesFileIndex) {
+ // Fast case, we got the file in order (or we only had one).
+ writeFileNow(name, content, handler);
+ classesFileIndex++;
+ writeNextIfAvailable(handler);
+ } else {
+ // Data is released in the application writer, take a copy.
+ delayedClassesDexFiles.put(index,
+ new DelayedData(name, ByteDataView.of(content.copyByteData()), false));
+ }
+ }
+
@Override
public Origin getOrigin() {
return origin;
@@ -132,4 +189,32 @@
public Path getPath() {
return archive;
}
+
+ private static class DelayedData implements Comparable<DelayedData> {
+ public final String name;
+ public final ByteDataView content;
+ public final boolean isDirectory;
+
+ public static DelayedData createFile(String name, ByteDataView content) {
+ return new DelayedData(name, content, false);
+ }
+
+ public static DelayedData createDirectory(String name) {
+ return new DelayedData(name, null, true);
+ }
+
+ private DelayedData(String name, ByteDataView content, boolean isDirectory) {
+ this.name = name;
+ this.content = content;
+ this.isDirectory = isDirectory;
+ }
+
+ @Override
+ public int compareTo(DelayedData other) {
+ if (other == null) {
+ return name.compareTo(null);
+ }
+ return name.compareTo(other.name);
+ }
+ }
}
diff --git a/src/main/java/com/android/tools/r8/utils/DirectoryBuilder.java b/src/main/java/com/android/tools/r8/utils/DirectoryBuilder.java
index 8e0b054..f78983f 100644
--- a/src/main/java/com/android/tools/r8/utils/DirectoryBuilder.java
+++ b/src/main/java/com/android/tools/r8/utils/DirectoryBuilder.java
@@ -68,6 +68,12 @@
}
@Override
+ public void addIndexedClassFile(
+ int index, String name, ByteDataView content, DiagnosticsHandler handler) {
+ addFile(name, content, handler);
+ }
+
+ @Override
public Origin getOrigin() {
return origin;
}
diff --git a/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java b/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java
index 8fa85bf..ee11bcf 100644
--- a/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java
+++ b/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java
@@ -11,6 +11,8 @@
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.origin.PathOrigin;
import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.nio.file.FileSystemException;
import java.nio.file.Paths;
import java.util.function.Consumer;
@@ -65,6 +67,13 @@
} catch (ResourceException e) {
throw reporter.fatalError(new ExceptionDiagnostic(e, e.getOrigin()));
} catch (AssertionError e) {
+ // Most of our assertions don't have a message, create a wrapper that has the stack as the
+ // message.
+ if (e.getMessage() == null) {
+ StringWriter stack = new StringWriter();
+ e.printStackTrace(new PrintWriter(stack));
+ e = new AssertionError(stack.toString(), e);
+ }
throw reporter.fatalError(new ExceptionDiagnostic(e, Origin.unknown()), e);
}
reporter.failIfPendingErrors();
diff --git a/src/main/java/com/android/tools/r8/utils/OutputBuilder.java b/src/main/java/com/android/tools/r8/utils/OutputBuilder.java
index 9077f7b..be739e3 100644
--- a/src/main/java/com/android/tools/r8/utils/OutputBuilder.java
+++ b/src/main/java/com/android/tools/r8/utils/OutputBuilder.java
@@ -23,6 +23,9 @@
void addFile(String name, ByteDataView content, DiagnosticsHandler handler);
+ void addIndexedClassFile(
+ int index, String name, ByteDataView content, DiagnosticsHandler handler);
+
Path getPath();
Origin getOrigin();
diff --git a/src/test/java/com/android/tools/r8/DXTestBuilder.java b/src/test/java/com/android/tools/r8/DXTestBuilder.java
index 8312729..190db23 100644
--- a/src/test/java/com/android/tools/r8/DXTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/DXTestBuilder.java
@@ -67,6 +67,11 @@
}
@Override
+ public DXTestBuilder addProgramClassFileData(Collection<byte[]> classes) {
+ throw new Unimplemented("No support for adding classfile data directly");
+ }
+
+ @Override
public DXTestBuilder addProgramFiles(Collection<Path> files) {
injars.addAll(files);
return self();
diff --git a/src/test/java/com/android/tools/r8/Dex2OatTestRunResult.java b/src/test/java/com/android/tools/r8/Dex2OatTestRunResult.java
new file mode 100644
index 0000000..c4425b1
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/Dex2OatTestRunResult.java
@@ -0,0 +1,20 @@
+// Copyright (c) 2018, 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;
+
+import com.android.tools.r8.ToolHelper.ProcessResult;
+import com.android.tools.r8.utils.AndroidApp;
+
+public class Dex2OatTestRunResult extends TestRunResult<Dex2OatTestRunResult> {
+
+ public Dex2OatTestRunResult(AndroidApp app, ProcessResult result) {
+ super(app, result);
+ }
+
+ @Override
+ protected Dex2OatTestRunResult self() {
+ return this;
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/JvmTestBuilder.java b/src/test/java/com/android/tools/r8/JvmTestBuilder.java
index 44a3bed..f95e666 100644
--- a/src/test/java/com/android/tools/r8/JvmTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/JvmTestBuilder.java
@@ -147,6 +147,12 @@
"No support for adding paths directly (we need to compute the descriptor)");
}
+ @Override
+ public JvmTestBuilder addProgramClassFileData(Collection<byte[]> files) {
+ throw new Unimplemented(
+ "No support for adding classfile data directly (we need to compute the descriptor)");
+ }
+
public JvmTestBuilder addClasspath(Path... paths) {
return addClasspath(Arrays.asList(paths));
}
diff --git a/src/test/java/com/android/tools/r8/ProguardTestBuilder.java b/src/test/java/com/android/tools/r8/ProguardTestBuilder.java
index 28ce1e6..fa4c41c 100644
--- a/src/test/java/com/android/tools/r8/ProguardTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/ProguardTestBuilder.java
@@ -184,6 +184,12 @@
}
@Override
+ public ProguardTestBuilder addProgramClassFileData(Collection<byte[]> classes) {
+ throw new Unimplemented(
+ "No support for adding classfile data directly (we need to compute the descriptor)");
+ }
+
+ @Override
public ProguardTestBuilder addKeepRules(Collection<String> rules) {
config.addAll(rules);
return self();
diff --git a/src/test/java/com/android/tools/r8/TestBuilder.java b/src/test/java/com/android/tools/r8/TestBuilder.java
index 0675118..61bf1b3 100644
--- a/src/test/java/com/android/tools/r8/TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestBuilder.java
@@ -39,6 +39,12 @@
public abstract T addProgramFiles(Collection<Path> files);
+ public abstract T addProgramClassFileData(Collection<byte[]> classes);
+
+ public T addProgramClassFileData(byte[]... classes) {
+ return addProgramClassFileData(Arrays.asList(classes));
+ }
+
public T addProgramClasses(Class<?>... classes) {
return addProgramClasses(Arrays.asList(classes));
}
diff --git a/src/test/java/com/android/tools/r8/TestCompileResult.java b/src/test/java/com/android/tools/r8/TestCompileResult.java
index 12d1990..61f9def 100644
--- a/src/test/java/com/android/tools/r8/TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/TestCompileResult.java
@@ -6,6 +6,7 @@
import static com.android.tools.r8.TestBase.Backend.DEX;
import com.android.tools.r8.TestBase.Backend;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.debug.CfDebugTestConfig;
import com.android.tools.r8.debug.DebugTestConfig;
@@ -98,4 +99,17 @@
ProcessResult result = ToolHelper.runArtRaw(out.toString(), mainClass);
return createRunResult(app, result);
}
+
+ public Dex2OatTestRunResult runDex2Oat() throws IOException {
+ return runDex2Oat(ToolHelper.getDexVm());
+ }
+
+ public Dex2OatTestRunResult runDex2Oat(DexVm vm) throws IOException {
+ assert getBackend() == DEX;
+ Path tmp = state.getNewTempFolder();
+ Path jarFile = tmp.resolve("out.jar");
+ Path oatFile = tmp.resolve("out.oat");
+ app.writeToZip(jarFile, OutputMode.DexIndexed);
+ return new Dex2OatTestRunResult(app, ToolHelper.runDex2OatRaw(jarFile, oatFile, vm));
+ }
}
diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index f60db7f..9425df9 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -5,6 +5,7 @@
import com.android.tools.r8.TestBase.Backend;
import com.android.tools.r8.debug.DebugTestConfig;
+import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.AndroidAppConsumers;
@@ -36,6 +37,7 @@
// Default initialized setup. Can be overwritten if needed.
private Path defaultLibrary;
private ProgramConsumer programConsumer;
+ private StringConsumer mainDexListConsumer;
private AndroidApiLevel defaultMinApiLevel = ToolHelper.getMinApiLevelForDexVm();
private Consumer<InternalOptions> optionsConsumer = DEFAULT_OPTIONS;
@@ -61,6 +63,7 @@
public CR compile() throws CompilationFailedException {
AndroidAppConsumers sink = new AndroidAppConsumers();
builder.setProgramConsumer(sink.wrapProgramConsumer(programConsumer));
+ builder.setMainDexListConsumer(mainDexListConsumer);
if (defaultLibrary != null) {
builder.addLibraryFiles(defaultLibrary);
}
@@ -112,6 +115,25 @@
return self();
}
+ public T setMainDexListConsumer(StringConsumer consumer) {
+ assert consumer != null;
+ this.mainDexListConsumer = consumer;
+ return self();
+ }
+
+ public T addMainDexListFiles(Collection<Path> files) {
+ builder.addMainDexListFiles(files);
+ return self();
+ }
+
+ @Override
+ public T addProgramClassFileData(Collection<byte[]> classes) {
+ for (byte[] clazz : classes) {
+ builder.addClassProgramData(clazz, Origin.unknown());
+ }
+ return self();
+ }
+
@Override
public T addProgramFiles(Collection<Path> files) {
builder.addProgramFiles(files);
@@ -124,4 +146,9 @@
builder.addLibraryFiles(files);
return self();
}
+
+ public T noDesugaring() {
+ builder.setDisableDesugaring(true);
+ return self();
+ }
}
diff --git a/src/test/java/com/android/tools/r8/TestRunResult.java b/src/test/java/com/android/tools/r8/TestRunResult.java
index f3ec339..a193bdb 100644
--- a/src/test/java/com/android/tools/r8/TestRunResult.java
+++ b/src/test/java/com/android/tools/r8/TestRunResult.java
@@ -88,6 +88,13 @@
return self();
}
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ appendInfo(builder);
+ return builder.toString();
+ }
+
private String errorMessage(String message) {
return errorMessage(message, null);
}
diff --git a/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java b/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
index 0607b0e..af238f2 100644
--- a/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
+++ b/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
@@ -19,6 +19,7 @@
import com.android.tools.r8.R8RunArtTestsTest.CompilerUnderTest;
import com.android.tools.r8.ResourceException;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.dex.ApplicationWriter;
import com.android.tools.r8.naming.MemberNaming.FieldSignature;
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
import com.android.tools.r8.utils.AndroidApiLevel;
@@ -41,13 +42,18 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.junit.Assert;
import org.junit.ComparisonFailure;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -77,6 +83,22 @@
return result;
}
+ public void assertIdenticalZipFiles(File file1, File file2) throws IOException {
+ try (ZipFile zipFile1 = new ZipFile(file1); ZipFile zipFile2 = new ZipFile(file2)) {
+ final Enumeration<? extends ZipEntry> entries1 = zipFile1.entries();
+ final Enumeration<? extends ZipEntry> entries2 = zipFile2.entries();
+
+ while (entries1.hasMoreElements()) {
+ Assert.assertTrue(entries2.hasMoreElements());
+ ZipEntry entry1 = entries1.nextElement();
+ ZipEntry entry2 = entries2.nextElement();
+ Assert.assertEquals(entry1.getName(), entry2.getName());
+ Assert.assertEquals(entry1.getCrc(), entry2.getCrc());
+ Assert.assertEquals(entry1.getSize(), entry2.getSize());
+ }
+ }
+ }
+
public AndroidApp runAndCheckVerification(
CompilerUnderTest compiler,
CompilationMode mode,
@@ -85,6 +107,19 @@
Consumer<InternalOptions> optionsConsumer,
List<String> inputs)
throws ExecutionException, IOException, CompilationFailedException {
+ return runAndCheckVerification(compiler, mode, referenceApk, pgConfs, optionsConsumer,
+ DexIndexedConsumer::emptyConsumer, inputs);
+ }
+
+ public AndroidApp runAndCheckVerification(
+ CompilerUnderTest compiler,
+ CompilationMode mode,
+ String referenceApk,
+ List<String> pgConfs,
+ Consumer<InternalOptions> optionsConsumer,
+ Supplier<DexIndexedConsumer> dexIndexedConsumerSupplier,
+ List<String> inputs)
+ throws ExecutionException, IOException, CompilationFailedException {
assertTrue(referenceApk == null || new File(referenceApk).exists());
AndroidAppConsumers outputApp;
if (compiler == CompilerUnderTest.R8) {
@@ -95,7 +130,7 @@
pgConfs.stream().map(Paths::get).collect(Collectors.toList()));
}
builder.setMode(mode);
- builder.setProgramConsumer(DexIndexedConsumer.emptyConsumer());
+ builder.setProgramConsumer(dexIndexedConsumerSupplier.get());
builder.setMinApiLevel(AndroidApiLevel.L.getLevel());
ToolHelper.allowPartiallyImplementedProguardOptions(builder);
ToolHelper.addProguardConfigurationConsumer(
@@ -119,6 +154,7 @@
return checkVerification(outputApp.build(), referenceApk);
}
+
public AndroidApp checkVerification(AndroidApp outputApp, String referenceApk)
throws IOException, ExecutionException {
Path out = temp.getRoot().toPath().resolve("all.zip");
diff --git a/src/test/java/com/android/tools/r8/internal/GMSCoreDeployJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/GMSCoreDeployJarVerificationTest.java
index 09ce657..634ff6f 100644
--- a/src/test/java/com/android/tools/r8/internal/GMSCoreDeployJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/GMSCoreDeployJarVerificationTest.java
@@ -5,6 +5,7 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.CompilationMode;
+import com.android.tools.r8.DexIndexedConsumer;
import com.android.tools.r8.R8RunArtTestsTest.CompilerUnderTest;
import com.android.tools.r8.shaking.ProguardRuleParserException;
import com.android.tools.r8.utils.AndroidApp;
@@ -13,6 +14,7 @@
import java.util.Collections;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
+import java.util.function.Supplier;
public class GMSCoreDeployJarVerificationTest extends GMSCoreCompilationTestBase {
@@ -38,4 +40,20 @@
optionsConsumer,
Collections.singletonList(base + DEPLOY_JAR));
}
+
+ public AndroidApp buildFromDeployJar(
+ CompilerUnderTest compiler, CompilationMode mode, String base, boolean hasReference,
+ Consumer<InternalOptions> optionsConsumer, Supplier<DexIndexedConsumer> consumerSupplier)
+ throws ExecutionException, IOException, ProguardRuleParserException,
+ CompilationFailedException {
+ return runAndCheckVerification(
+ compiler,
+ mode,
+ hasReference ? base + REFERENCE_APK : null,
+ null,
+ optionsConsumer,
+ consumerSupplier,
+ Collections.singletonList(base + DEPLOY_JAR));
+ }
+
}
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
index d881185..5803355 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
@@ -7,8 +7,12 @@
import static org.junit.Assert.assertEquals;
import com.android.tools.r8.CompilationMode;
+import com.android.tools.r8.DexIndexedConsumer;
+import com.android.tools.r8.DexIndexedConsumer.ArchiveConsumer;
import com.android.tools.r8.R8RunArtTestsTest.CompilerUnderTest;
import com.android.tools.r8.utils.AndroidApp;
+import java.io.File;
+import java.util.function.Supplier;
import org.junit.Test;
public class R8GMSCoreV10DeployJarVerificationTest extends GMSCoreDeployJarVerificationTest {
@@ -19,6 +23,9 @@
@Test
public void buildFromDeployJar() throws Exception {
// TODO(tamaskenez): set hasReference = true when we have the noshrink file for V10
+ File tempFolder = temp.newFolder();
+ File app1Zip = new File(tempFolder, "app1.zip");
+ File app2Zip = new File(tempFolder, "app2.zip");
AndroidApp app1 =
buildFromDeployJar(
CompilerUnderTest.R8,
@@ -27,7 +34,8 @@
false,
options ->
options.proguardMapConsumer =
- (proguardMap, handler) -> this.proguardMap1 = proguardMap);
+ (proguardMap, handler) -> this.proguardMap1 = proguardMap,
+ ()-> new ArchiveConsumer(app1Zip.toPath(), true));
AndroidApp app2 =
buildFromDeployJar(
CompilerUnderTest.R8,
@@ -36,10 +44,14 @@
false,
options ->
options.proguardMapConsumer =
- (proguardMap, handler) -> this.proguardMap2 = proguardMap);
+ (proguardMap, handler) -> this.proguardMap2 = proguardMap,
+ ()-> new ArchiveConsumer(app2Zip.toPath(), true));
+
+
// Verify that the result of the two compilations was the same.
assertIdenticalApplications(app1, app2);
+ assertIdenticalZipFiles(app1Zip, app2Zip);
assertEquals(proguardMap1, proguardMap2);
}
}
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/type/NullabilityTest.java b/src/test/java/com/android/tools/r8/ir/analysis/type/NullabilityTest.java
index 35ebae5..adf80ae 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/type/NullabilityTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/type/NullabilityTest.java
@@ -34,6 +34,7 @@
import com.android.tools.r8.utils.DescriptorUtils;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import java.util.Map;
import java.util.function.BiConsumer;
import org.junit.Test;
@@ -50,7 +51,7 @@
DexEncodedMethod foo = codeInspector.clazz(mainClass.getName()).method(signature).getMethod();
IRCode irCode =
foo.buildIR(appInfo, GraphLense.getIdentityLense(), TEST_OPTIONS, Origin.unknown());
- NonNullTracker nonNullTracker = new NonNullTracker(appInfo);
+ NonNullTracker nonNullTracker = new NonNullTracker(appInfo, ImmutableSet.of());
nonNullTracker.addNonNull(irCode);
TypeAnalysis analysis = new TypeAnalysis(appInfo, foo);
analysis.widening(foo, irCode);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/NonNullTrackerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/NonNullTrackerTest.java
index e569ad2..0ada569 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/NonNullTrackerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/NonNullTrackerTest.java
@@ -23,6 +23,7 @@
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import com.google.common.collect.ImmutableSet;
import java.util.function.Consumer;
import org.junit.Test;
@@ -41,7 +42,7 @@
foo.buildIR(appInfo, GraphLense.getIdentityLense(), TEST_OPTIONS, Origin.unknown());
checkCountOfNonNull(irCode, 0);
- NonNullTracker nonNullTracker = new NonNullTracker(appInfo);
+ NonNullTracker nonNullTracker = new NonNullTracker(appInfo, ImmutableSet.of());
nonNullTracker.addNonNull(irCode);
assertTrue(irCode.isConsistentSSA());
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
index 4e6bb21..592aeae 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
@@ -12,7 +12,10 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.R8Command;
import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestRunResult;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.ir.optimize.classinliner.builders.BuildersTestClass;
@@ -38,6 +41,7 @@
import com.android.tools.r8.jasmin.JasminBuilder;
import com.android.tools.r8.jasmin.JasminBuilder.ClassBuilder;
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
+import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.StringUtils;
@@ -46,9 +50,9 @@
import com.android.tools.r8.utils.codeinspector.FieldAccessInstructionSubject;
import com.android.tools.r8.utils.codeinspector.InstructionSubject;
import com.android.tools.r8.utils.codeinspector.NewInstanceInstructionSubject;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import com.google.common.collect.Streams;
-import java.io.IOException;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Iterator;
@@ -73,39 +77,35 @@
this.backend = backend;
}
- private String run(AndroidApp app, Class mainClass) throws IOException {
- if (backend == Backend.DEX) {
- return runOnArt(app, mainClass);
- } else {
- assert backend == Backend.CF;
- return runOnJava(app, mainClass);
- }
- }
-
@Test
public void testTrivial() throws Exception {
- byte[][] classes = {
- ToolHelper.getClassAsBytes(TrivialTestClass.class),
- ToolHelper.getClassAsBytes(TrivialTestClass.Inner.class),
- ToolHelper.getClassAsBytes(ReferencedFields.class),
- ToolHelper.getClassAsBytes(EmptyClass.class),
- ToolHelper.getClassAsBytes(EmptyClassWithInitializer.class),
- ToolHelper.getClassAsBytes(Iface1.class),
- ToolHelper.getClassAsBytes(Iface1Impl.class),
- ToolHelper.getClassAsBytes(Iface2.class),
- ToolHelper.getClassAsBytes(Iface2Impl.class),
- ToolHelper.getClassAsBytes(CycleReferenceAB.class),
- ToolHelper.getClassAsBytes(CycleReferenceBA.class),
- ToolHelper.getClassAsBytes(ClassWithFinal.class)
+ Class<?> main = TrivialTestClass.class;
+ Class<?>[] classes = {
+ TrivialTestClass.class,
+ TrivialTestClass.Inner.class,
+ ReferencedFields.class,
+ EmptyClass.class,
+ EmptyClassWithInitializer.class,
+ Iface1.class,
+ Iface1Impl.class,
+ Iface2.class,
+ Iface2Impl.class,
+ CycleReferenceAB.class,
+ CycleReferenceBA.class,
+ ClassWithFinal.class
};
- AndroidApp app = runR8(buildAndroidApp(classes), TrivialTestClass.class);
+ String javaOutput = runOnJava(main);
+ TestRunResult result = testForR8(backend)
+ .addProgramClasses(classes)
+ .addKeepMainRule(main)
+ .addKeepRules(
+ "-dontobfuscate", "-allowaccessmodification", "-keepattributes LineNumberTable")
+ .addOptionsModification(this::configure)
+ .run(main)
+ .assertSuccessWithOutput(javaOutput);
- String javaOutput = runOnJava(TrivialTestClass.class);
- String output = run(app, TrivialTestClass.class);
- assertEquals(javaOutput, output);
-
- CodeInspector inspector = new CodeInspector(app);
- ClassSubject clazz = inspector.clazz(TrivialTestClass.class);
+ CodeInspector inspector = result.inspector();
+ ClassSubject clazz = inspector.clazz(main);
assertEquals(
Collections.singleton("java.lang.StringBuilder"),
@@ -162,28 +162,44 @@
@Test
public void testBuilders() throws Exception {
- byte[][] classes = {
- ToolHelper.getClassAsBytes(BuildersTestClass.class),
- ToolHelper.getClassAsBytes(BuildersTestClass.Pos.class),
- ToolHelper.getClassAsBytes(Tuple.class),
- ToolHelper.getClassAsBytes(Pair.class),
- ToolHelper.getClassAsBytes(PairBuilder.class),
- ToolHelper.getClassAsBytes(ControlFlow.class),
+ Class<?> main = BuildersTestClass.class;
+ Class<?>[] classes = {
+ NeverInline.class,
+ BuildersTestClass.class,
+ BuildersTestClass.Pos.class,
+ Tuple.class,
+ Pair.class,
+ PairBuilder.class,
+ ControlFlow.class,
};
- AndroidApp app = runR8(buildAndroidApp(classes), BuildersTestClass.class);
+ String javaOutput = runOnJava(main);
+ TestRunResult result = testForR8(backend)
+ .addProgramClasses(classes)
+ .enableProguardTestOptions()
+ .enableInliningAnnotations()
+ .addKeepMainRule(main)
+ .addKeepRules(
+ "-dontobfuscate", "-allowaccessmodification", "-keepattributes LineNumberTable")
+ .addOptionsModification(this::configure)
+ .run(main)
+ .assertSuccessWithOutput(javaOutput);
- String javaOutput = runOnJava(BuildersTestClass.class);
- String output = run(app, BuildersTestClass.class);
- assertEquals(javaOutput, output);
+ CodeInspector inspector = result.inspector();
+ ClassSubject clazz = inspector.clazz(main);
- CodeInspector inspector = new CodeInspector(app);
- ClassSubject clazz = inspector.clazz(BuildersTestClass.class);
-
- assertEquals(
- Sets.newHashSet(
- "com.android.tools.r8.ir.optimize.classinliner.builders.Pair",
- "java.lang.StringBuilder"),
- collectTypes(clazz, "testSimpleBuilder", "void"));
+ for (int i = 1; i <= 3; i++) {
+ Set<String> expected =
+ Sets.newHashSet(
+ "com.android.tools.r8.ir.optimize.classinliner.builders.Pair",
+ "java.lang.StringBuilder");
+ if (backend == Backend.CF && i < 3) {
+ // const-string canonicalization is disabled in CF, which helps ClassInliner identify
+ // PairBuilder as candidate. Concatenated builder calls in test #3 bother that again.
+ expected.add("com.android.tools.r8.ir.optimize.classinliner.builders.PairBuilder");
+ }
+ assertEquals(expected,
+ collectTypes(clazz, "testSimpleBuilder" + i, "void"));
+ }
// Note that Pair created instances were also inlined in the following method since
// we use 'System.out.println(pX.toString())', if we used 'System.out.println(pX)'
@@ -193,7 +209,9 @@
Collections.singleton("java.lang.StringBuilder"),
collectTypes(clazz, "testSimpleBuilderWithMultipleBuilds", "void"));
- assertFalse(inspector.clazz(PairBuilder.class).isPresent());
+ if (backend == Backend.DEX) {
+ assertFalse(inspector.clazz(PairBuilder.class).isPresent());
+ }
assertEquals(
Collections.singleton("java.lang.StringBuilder"),
@@ -242,7 +260,6 @@
runOnJavaRaw(mainClass.name, builder.buildClasses().toArray(new byte[2][]));
assertThat(javaResult.stderr, containsString("IncompatibleClassChangeError"));
- assert backend == Backend.DEX || backend == Backend.CF;
// Check that the code fails with an IncompatibleClassChangeError with ART.
ProcessResult result =
backend == Backend.DEX
@@ -253,19 +270,24 @@
@Test
public void testCodeSample() throws Exception {
- byte[][] classes = {
- ToolHelper.getClassAsBytes(C.class),
- ToolHelper.getClassAsBytes(C.L.class),
- ToolHelper.getClassAsBytes(C.F.class),
- ToolHelper.getClassAsBytes(CodeTestClass.class)
+ Class<?> main = CodeTestClass.class;
+ Class<?>[] classes = {
+ C.class,
+ C.L.class,
+ C.F.class,
+ CodeTestClass.class
};
- AndroidApp app = runR8(buildAndroidApp(classes), CodeTestClass.class);
+ String javaOutput = runOnJava(main);
+ TestRunResult result = testForR8(backend)
+ .addProgramClasses(classes)
+ .addKeepMainRule(main)
+ .addKeepRules(
+ "-dontobfuscate", "-allowaccessmodification", "-keepattributes LineNumberTable")
+ .addOptionsModification(this::configure)
+ .run(main)
+ .assertSuccessWithOutput(javaOutput);
- String javaOutput = runOnJava(CodeTestClass.class);
- String output = run(app, CodeTestClass.class);
- assertEquals(javaOutput, output);
-
- CodeInspector inspector = new CodeInspector(app);
+ CodeInspector inspector = result.inspector();
ClassSubject clazz = inspector.clazz(C.class);
assertEquals(
@@ -287,22 +309,26 @@
@Test
public void testInvalidatedRoot() throws Exception {
String prefix = "com.android.tools.r8.ir.optimize.classinliner.invalidroot.";
-
- byte[][] classes = {
- ToolHelper.getClassAsBytes(InvalidRootsTestClass.class),
- ToolHelper.getClassAsBytes(InvalidRootsTestClass.A.class),
- ToolHelper.getClassAsBytes(InvalidRootsTestClass.B.class),
- ToolHelper.getClassAsBytes(InvalidRootsTestClass.NeverReturnsNormally.class),
- ToolHelper.getClassAsBytes(InvalidRootsTestClass.InitNeverReturnsNormally.class)
+ Class<?> main = InvalidRootsTestClass.class;
+ Class<?>[] classes = {
+ InvalidRootsTestClass.class,
+ InvalidRootsTestClass.A.class,
+ InvalidRootsTestClass.B.class,
+ InvalidRootsTestClass.NeverReturnsNormally.class,
+ InvalidRootsTestClass.InitNeverReturnsNormally.class
};
- AndroidApp app = runR8(buildAndroidApp(classes), InvalidRootsTestClass.class);
+ String javaOutput = runOnJava(main);
+ TestRunResult result = testForR8(backend)
+ .addProgramClasses(classes)
+ .addKeepMainRule(main)
+ .addKeepRules(
+ "-dontobfuscate", "-allowaccessmodification", "-keepattributes LineNumberTable")
+ .addOptionsModification(this::configure)
+ .run(main)
+ .assertSuccessWithOutput(javaOutput);
- String javaOutput = runOnJava(InvalidRootsTestClass.class);
- String output = run(app, InvalidRootsTestClass.class);
- assertEquals(javaOutput, output);
-
- CodeInspector inspector = new CodeInspector(app);
- ClassSubject clazz = inspector.clazz(InvalidRootsTestClass.class);
+ CodeInspector inspector = result.inspector();
+ ClassSubject clazz = inspector.clazz(main);
assertEquals(
Sets.newHashSet(prefix + "InvalidRootsTestClass$NeverReturnsNormally"),
@@ -331,20 +357,25 @@
@Test
public void testDesugaredLambdas() throws Exception {
- Assume.assumeFalse(backend == Backend.CF); // No desugaring with CF backend.
- byte[][] classes = {
- ToolHelper.getClassAsBytes(LambdasTestClass.class),
- ToolHelper.getClassAsBytes(LambdasTestClass.Iface.class),
- ToolHelper.getClassAsBytes(LambdasTestClass.IfaceUtil.class),
+ Assume.assumeFalse("No desugaring with CF backend", backend == Backend.CF);
+ Class<?> main = LambdasTestClass.class;
+ Class<?>[] classes = {
+ LambdasTestClass.class,
+ LambdasTestClass.Iface.class,
+ LambdasTestClass.IfaceUtil.class
};
- AndroidApp app = runR8(buildAndroidApp(classes), LambdasTestClass.class);
+ String javaOutput = runOnJava(main);
+ TestRunResult result = testForR8(backend)
+ .addProgramClasses(classes)
+ .addKeepMainRule(main)
+ .addKeepRules(
+ "-dontobfuscate", "-allowaccessmodification", "-keepattributes LineNumberTable")
+ .addOptionsModification(this::configure)
+ .run(main)
+ .assertSuccessWithOutput(javaOutput);
- String javaOutput = runOnJava(LambdasTestClass.class);
- String output = run(app, LambdasTestClass.class);
- assertEquals(javaOutput, output);
-
- CodeInspector inspector = new CodeInspector(app);
- ClassSubject clazz = inspector.clazz(LambdasTestClass.class);
+ CodeInspector inspector = result.inspector();
+ ClassSubject clazz = inspector.clazz(main);
assertEquals(
Sets.newHashSet(
@@ -391,42 +422,6 @@
.map(fais -> fais.holder().toString());
}
- private AndroidApp runR8(AndroidApp app, Class mainClass) throws Exception {
- AndroidApp compiled =
- compileWithR8(
- app, getProguardConfig(mainClass.getCanonicalName()), this::configure, backend);
-
- // Materialize file for execution.
- Path generatedFile = temp.getRoot().toPath().resolve("classes.jar");
- compiled.writeToZip(generatedFile, outputMode(backend));
-
- assert backend == Backend.DEX || backend == Backend.CF;
-
- String output =
- backend == Backend.DEX
- ? ToolHelper.runArtNoVerificationErrors(
- generatedFile.toString(), mainClass.getCanonicalName())
- : ToolHelper.runJava(generatedFile, mainClass.getCanonicalName()).stdout;
-
- // Compare with Java.
- ToolHelper.ProcessResult javaResult = ToolHelper.runJava(
- ToolHelper.getClassPathForTests(), mainClass.getCanonicalName());
-
- if (javaResult.exitCode != 0) {
- System.out.println(javaResult.stdout);
- System.err.println(javaResult.stderr);
- fail("JVM on original program failed for: " + mainClass);
- }
- assertEquals(
- backend == Backend.DEX
- ? "JVM and ART output differ."
- : "Output of original and processed program differ on JVM.",
- javaResult.stdout,
- output);
-
- return compiled;
- }
-
private String getProguardConfig(String main) {
return StringUtils.joinLines(
keepMainProguardConfiguration(main),
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/builders/BuildersTestClass.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/builders/BuildersTestClass.java
index 1516e14..aa6d4dc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/builders/BuildersTestClass.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/builders/BuildersTestClass.java
@@ -4,6 +4,8 @@
package com.android.tools.r8.ir.optimize.classinliner.builders;
+import com.android.tools.r8.NeverInline;
+
public class BuildersTestClass {
private static int ID = 0;
@@ -17,31 +19,35 @@
public static void main(String[] args) {
BuildersTestClass test = new BuildersTestClass();
- test.testSimpleBuilder();
+ test.testSimpleBuilder1();
test.testSimpleBuilderWithMultipleBuilds();
test.testBuilderConstructors();
test.testWithControlFlow();
test.testWithMoreControlFlow();
}
- private synchronized void testSimpleBuilder() {
+ @NeverInline
+ private void testSimpleBuilder1() {
System.out.println(
- new PairBuilder<String, String>().setFirst("f-" + next()).build().toString());
+ new PairBuilder<String, String>().setFirst("f-" + next()).build());
testSimpleBuilder2();
testSimpleBuilder3();
}
- private synchronized void testSimpleBuilder2() {
+ @NeverInline
+ private void testSimpleBuilder2() {
System.out.println(
- new PairBuilder<String, String>().setSecond("s-" + next()).build().toString());
+ new PairBuilder<String, String>().setSecond("s-" + next()).build());
}
- private synchronized void testSimpleBuilder3() {
+ @NeverInline
+ private void testSimpleBuilder3() {
System.out.println(new PairBuilder<String, String>()
- .setFirst("f-" + next()).setSecond("s-" + next()).build().toString());
+ .setFirst("f-" + next()).setSecond("s-" + next()).build());
}
- private synchronized void testSimpleBuilderWithMultipleBuilds() {
+ @NeverInline
+ private void testSimpleBuilderWithMultipleBuilds() {
PairBuilder<String, String> builder = new PairBuilder<>();
Pair p1 = builder.build();
System.out.println(p1.toString());
@@ -53,13 +59,15 @@
System.out.println(p3.toString());
}
- private synchronized void testBuilderConstructors() {
+ @NeverInline
+ private void testBuilderConstructors() {
System.out.println(new Tuple().toString());
System.out.println(new Tuple(true, (byte) 77, (short) 9977, '#', 42,
987654321123456789L, -12.34f, 43210.98765, "s-" + next() + "-s").toString());
}
- private synchronized void testWithControlFlow() {
+ @NeverInline
+ private void testWithControlFlow() {
ControlFlow flow = new ControlFlow(-1, 2, 7);
for (int k = 0; k < 25; k++) {
if (k % 3 == 0) {
@@ -71,7 +79,8 @@
System.out.println("flow = " + flow.toString());
}
- private synchronized void testWithMoreControlFlow() {
+ @NeverInline
+ private void testWithMoreControlFlow() {
String str = "1234567890";
Pos pos = new Pos();
while (pos.y < str.length()) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java
index f078262..6fea6cd 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java
@@ -134,6 +134,6 @@
inspector.clazz(TestClass.class).method("void", "bar", ImmutableList.of());
Iterator<InstructionSubject> barInstructionIterator =
barMethodSubject.iterateInstructions(InstructionSubject::isInstanceOf);
- assertEquals(6, Streams.stream(barInstructionIterator).count());
+ assertEquals(4, Streams.stream(barInstructionIterator).count());
}
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
index 09ab7f7..99cce0b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
@@ -153,6 +153,53 @@
// getSimpleName, local
"-Returned-empty-"
);
+ private static final String RENAMED_OUTPUT = StringUtils.lines(
+ // getName
+ "com.android.tools.r8.ir.optimize.reflection.e",
+ // getTypeName
+ // TODO(b/119426668): desugar Type#getTypeName
+ // "com.android.tools.r8.ir.optimize.reflection.e",
+ // getCanonicalName
+ "com.android.tools.r8.ir.optimize.reflection.e",
+ // getSimpleName
+ "e",
+ // getName, inner
+ "com.android.tools.r8.ir.optimize.reflection.c",
+ // getTypeName, inner
+ // TODO(b/119426668): desugar Type#getTypeName
+ // "com.android.tools.r8.ir.optimize.reflection.c",
+ // getCanonicalName, inner
+ "com.android.tools.r8.ir.optimize.reflection.c",
+ // getSimpleName, inner
+ "c",
+ // getName, array
+ "[Lcom.android.tools.r8.ir.optimize.reflection.e;",
+ // getTypeName, array
+ // TODO(b/119426668): desugar Type#getTypeName
+ // "com.android.tools.r8.ir.optimize.reflection.e[]",
+ // getCanonicalName, array
+ "com.android.tools.r8.ir.optimize.reflection.e[]",
+ // getSimpleName, array
+ "e[]",
+ // getName, anonymous
+ "com.android.tools.r8.ir.optimize.reflection.a",
+ // getTypeName, anonymous
+ // TODO(b/119426668): desugar Type#getTypeName
+ // "com.android.tools.r8.ir.optimize.reflection.a",
+ // getCanonicalName, anonymous
+ "-Returned-null-",
+ // getSimpleName, anonymous
+ "-Returned-empty-",
+ // getName, local
+ "com.android.tools.r8.ir.optimize.reflection.b",
+ // getTypeName, local
+ // TODO(b/119426668): desugar Type#getTypeName
+ // "com.android.tools.r8.ir.optimize.reflection.b,
+ // getCanonicalName, local
+ "-Returned-null-",
+ // getSimpleName, local
+ "-Returned-empty-"
+ );
private static final Class<?> MAIN = GetName0Main.class;
public GetNameTest(Backend backend, boolean enableMinification) throws Exception {
@@ -212,18 +259,13 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep class **.GetName0*")
- .addKeepRules("-keepattributes InnerClasses,EnclosingMethod");
+ .addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
+ .addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString());
if (!enableMinification) {
builder.addKeepRules("-dontobfuscate");
}
- TestRunResult result = builder.run(MAIN);
- if (enableMinification) {
- // TODO(b/118536394): Check even renamed names.
- test(result, 11);
- } else {
- result.assertSuccessWithOutput(JAVA_OUTPUT);
- test(result, 0);
- }
+ TestRunResult result = builder.run(MAIN).assertSuccessWithOutput(JAVA_OUTPUT);
+ test(result, 0);
}
@Test
@@ -235,7 +277,8 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep,allowobfuscation class **.GetName0*")
- .addKeepRules("-keepattributes InnerClasses,EnclosingMethod");
+ .addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
+ .addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString());
if (!enableMinification) {
builder.addKeepRules("-dontobfuscate");
}
@@ -245,12 +288,11 @@
if (backend == Backend.CF) {
return;
}
- // TODO(b/118536394): Check even renamed names.
- test(result, 11);
+ result.assertSuccessWithOutput(RENAMED_OUTPUT);
} else {
result.assertSuccessWithOutput(JAVA_OUTPUT);
- test(result, 0);
}
+ test(result, 0);
}
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java
index ef7a07b..22918c8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java
@@ -4,10 +4,13 @@
package com.android.tools.r8.ir.optimize.reflection;
import com.android.tools.r8.TestBase;
+import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.utils.BooleanUtils;
import com.android.tools.r8.utils.codeinspector.MethodSubject;
import com.google.common.collect.Streams;
+import java.io.IOException;
+import java.nio.file.Path;
import java.util.Collection;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -19,6 +22,7 @@
final Backend backend;
final boolean enableMinification;
+ Path mapping;
@Parameterized.Parameters(name = "Backend: {0} minification: {1}")
public static Collection<Object[]> data() {
@@ -30,6 +34,11 @@
this.enableMinification = enableMinification;
}
+ Path createNewMappingPath() throws IOException {
+ mapping = temp.newFile(ToolHelper.DEFAULT_PROGUARD_MAP_FILE).toPath();
+ return mapping;
+ }
+
static boolean isNameReflection(DexMethod method) {
return method.getHolder().toDescriptorString().equals(CLASS_DESCRIPTOR)
&& method.getArity() == 0
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
index 54015e3..5bc07da 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
@@ -88,6 +88,14 @@
"Local[][][]",
"[][][]"
);
+ private static final String RENAMED_OUTPUT = StringUtils.lines(
+ "f",
+ "e",
+ "b",
+ "a",
+ "d[][][]",
+ "[][][]"
+ );
private static final Class<?> MAIN = ClassGetSimpleName.class;
public GetSimpleNameTest(Backend backend, boolean enableMinification) throws Exception {
@@ -146,16 +154,12 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep class **.ClassGetSimpleName*")
- .addKeepRules("-keepattributes InnerClasses,EnclosingMethod");
+ .addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
+ .addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString());
if (!enableMinification) {
builder.addKeepRules("-dontobfuscate");
}
- TestRunResult result = builder.run(MAIN);
- if (enableMinification) {
- // TODO(b/118536394): Check even renamed simple name.
- } else {
- result.assertSuccessWithOutput(JAVA_OUTPUT);
- }
+ TestRunResult result = builder.run(MAIN).assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 0);
}
@@ -168,7 +172,8 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep,allowobfuscation class **.ClassGetSimpleName*")
- .addKeepRules("-keepattributes InnerClasses,EnclosingMethod");
+ .addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
+ .addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString());
if (!enableMinification) {
builder.addKeepRules("-dontobfuscate");
}
@@ -178,7 +183,7 @@
if (backend == Backend.CF) {
return;
}
- // TODO(b/118536394): Check even renamed simple name.
+ result.assertSuccessWithOutput(RENAMED_OUTPUT);
} else {
result.assertSuccessWithOutput(JAVA_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java
index 353dd50..284af11 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java
@@ -30,7 +30,10 @@
static boolean argCouldBeNull(String arg) {
return "CONST".contains(arg)
&& "prefix".startsWith(arg)
- && "suffix".endsWith(arg);
+ && "suffix".endsWith(arg)
+ && "CONST".equals(arg)
+ && "CONST".equalsIgnoreCase(arg)
+ && "CONST".contentEquals(arg);
}
public static void main(String[] args) {
@@ -39,6 +42,10 @@
System.out.println(s1.contains("CONST"));
System.out.println(s1.startsWith("prefix"));
System.out.println(s1.endsWith("suffix"));
+ System.out.println(s1.equals("prefix-CONST-suffix"));
+ System.out.println(s1.equalsIgnoreCase("PREFIX-const-SUFFIX"));
+ System.out.println(s1.contentEquals("prefix-CONST-suffix"));
+ System.out.println(s1.contentEquals(new StringBuffer("prefix-CONST-suffix")));
}
{
@@ -47,6 +54,10 @@
System.out.println(s2.contains("CONST"));
System.out.println(s2.startsWith("prefix"));
System.out.println(s2.endsWith("suffix"));
+ System.out.println(s2.equals("prefix-CONST-suffix"));
+ System.out.println(s2.equalsIgnoreCase("pre-con-suf"));
+ System.out.println(s2.contentEquals("prefix-CONST-suffix"));
+ System.out.println(s2.contentEquals(new StringBuffer("prefix-CONST-suffix")));
}
{
@@ -75,12 +86,28 @@
"true",
// s1, endsWith
"true",
+ // s1, equals
+ "true",
+ // s1, equalsIgnoreCase
+ "true",
+ // s1, contentEquals(CharSequence)
+ "true",
+ // s1, contentEquals(StringBuffer)
+ "true",
// s2, contains
"false",
// s2, startsWith
"false",
// s2, endsWith
"false",
+ // s2, equals
+ "false",
+ // s2, equalsIgnoreCase
+ "false",
+ // s2, contentEquals(CharSequence)
+ "false",
+ // s2, contentEquals(StringBuffer)
+ "false",
// argCouldBeNull
"false"
);
@@ -107,7 +134,10 @@
&& method.proto.returnType.isBooleanType()
&& (method.name.toString().equals("contains")
|| method.name.toString().equals("startsWith")
- || method.name.toString().equals("endsWith"));
+ || method.name.toString().equals("endsWith")
+ || method.name.toString().equals("equals")
+ || method.name.toString().equals("equalsIgnoreCase")
+ || method.name.toString().equals("contentEquals"));
}
private long countStringContentChecker(MethodSubject method) {
@@ -131,7 +161,7 @@
"boolean", "argCouldBeNull", ImmutableList.of("java.lang.String"));
assertThat(argCouldBeNull, isPresent());
// Because of nullable argument, all checkers should remain.
- assertEquals(3, countStringContentChecker(argCouldBeNull));
+ assertEquals(6, countStringContentChecker(argCouldBeNull));
}
@Test
@@ -143,14 +173,14 @@
.addProgramClasses(CLASSES)
.run(MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
- test(result, 6);
+ test(result, 14);
result = testForD8()
.release()
.addProgramClasses(CLASSES)
.run(MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
- test(result, 3);
+ test(result, 8);
}
@Test
@@ -162,6 +192,6 @@
.addKeepMainRule(MAIN)
.run(MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
- test(result, 3);
+ test(result, 8);
}
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
index 6642619..3f579c7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
@@ -54,13 +54,9 @@
public static void main(String[] args) {
Foo foo = new Foo();
- // TODO(b/118536394): valueOf in getter() can be removed if combined with name reflection
- // optimization, which will replace it with (definitely non-null) const-string.
System.out.println(foo.getter());
// Trivial, it's String.
String str = foo.toString();
- // TODO(b/119449728): But, it's still nullable.
- // valueOf can be removed if the nullability of its return value is modeled.
System.out.println(String.valueOf(str));
if (str != null) {
// With an explicit check, it's non-null String.
@@ -195,6 +191,6 @@
.addKeepRules("-dontobfuscate")
.run(MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
- test(result, 3, 1, 1);
+ test(result, 1, 1, 1);
}
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/MetadataStripTest.java b/src/test/java/com/android/tools/r8/kotlin/MetadataStripTest.java
index 1ab3147..dc2ba39 100644
--- a/src/test/java/com/android/tools/r8/kotlin/MetadataStripTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/MetadataStripTest.java
@@ -41,8 +41,6 @@
o -> {
o.enableTreeShaking = true;
o.enableMinification = true;
- // TODO(b/119626580): assertion failure at fixupStaticizedValueUsers.
- o.enableClassStaticizer = false;
};
@Parameterized.Parameters(name = "Backend: {0} target: {1}")
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
index c053e62..9d9f21d 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
@@ -9,16 +9,19 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.DexIndexedConsumer;
+import com.android.tools.r8.DexIndexedConsumer.ArchiveConsumer;
import com.android.tools.r8.Diagnostic;
import com.android.tools.r8.DiagnosticsHandler;
import com.android.tools.r8.OutputMode;
import com.android.tools.r8.R8Command;
+import com.android.tools.r8.StringConsumer;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.FileUtils;
import com.android.tools.r8.utils.StringDiagnostic;
import com.google.common.collect.ImmutableList;
+import java.io.IOException;
import java.nio.file.Path;
import java.util.stream.Collectors;
import org.junit.Rule;
@@ -27,6 +30,34 @@
public class MainDexListOutputTest extends TestBase {
+ interface MyConsumer<T> {
+ void accept(T element);
+ }
+
+ class TestClass {
+ public void f(MyConsumer<String> s) {
+ s.accept("asdf");
+ }
+
+ public void g() {
+ f(System.out::println);
+ }
+ }
+
+ private static String testClassMainDexName =
+ "com/android/tools/r8/maindexlist/MainDexListOutputTest$TestClass.class";
+
+ private static class TestMainDexListConsumer implements StringConsumer {
+ public boolean called = false;
+
+ @Override
+ public void accept(String string, DiagnosticsHandler handler) {
+ called = true;
+ assertTrue(string.contains(testClassMainDexName));
+ assertTrue(string.contains("Lambda"));
+ }
+ }
+
class Reporter implements DiagnosticsHandler {
int errorCount = 0;
@@ -77,4 +108,37 @@
.filter(s -> !s.isEmpty())
.collect(Collectors.toList()));
}
+
+ @Test
+ public void testD8DesugaredLambdasInMainDexList() throws IOException, CompilationFailedException {
+ Path mainDexList = writeTextToTempFile(testClassMainDexName);
+ TestMainDexListConsumer consumer = new TestMainDexListConsumer();
+ testForD8()
+ .addProgramClasses(ImmutableList.of(TestClass.class, MyConsumer.class))
+ .addMainDexListFiles(ImmutableList.of(mainDexList))
+ .setMainDexListConsumer(consumer)
+ .compile();
+ assertTrue(consumer.called);
+ }
+
+ @Test
+ public void testD8DesugaredLambdasInMainDexListMerging()
+ throws IOException, CompilationFailedException {
+ Path mainDexList = writeTextToTempFile(testClassMainDexName);
+ Path dexOutput = temp.getRoot().toPath().resolve("classes.zip");
+ // Build intermediate dex code first.
+ testForD8()
+ .addProgramClasses(ImmutableList.of(TestClass.class, MyConsumer.class))
+ .setIntermediate(true)
+ .setProgramConsumer(new ArchiveConsumer(dexOutput))
+ .compile();
+ // Now test that when merging with a main dex list it is correctly updated.
+ TestMainDexListConsumer consumer = new TestMainDexListConsumer();
+ testForD8()
+ .addProgramFiles(dexOutput)
+ .addMainDexListFiles(ImmutableList.of(mainDexList))
+ .setMainDexListConsumer(consumer)
+ .compile();
+ assertTrue(consumer.called);
+ }
}
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java
index ddb0e7d..e013b02 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java
@@ -20,15 +20,21 @@
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.StringUtils;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.PrintStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.LinkedList;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
import org.junit.Assert;
import org.junit.Test;
@@ -301,6 +307,34 @@
nonLambdaOffset++;
}
}
+ testZipfileOrder(out);
+ }
+
+ private void testZipfileOrder(Path out) throws IOException {
+ // Sanity check that the classes.dex files are in the correct order
+ ZipFile outZip = new ZipFile(out.toFile());
+ Enumeration<? extends ZipEntry> entries = outZip.entries();
+ int index = 0;
+ LinkedList<String> entryNames = new LinkedList<>();
+ // We expect classes*.dex files first, in order, then the rest of the files, in order.
+ while(entries.hasMoreElements()) {
+ ZipEntry entry = entries.nextElement();
+ if (!entry.getName().startsWith("classes") || !entry.getName().endsWith(".dex")) {
+ entryNames.add(entry.getName());
+ continue;
+ }
+ if (index == 0) {
+ Assert.assertEquals("classes.dex", entry.getName());
+ } else {
+ Assert.assertEquals("classes" + (index + 1) + ".dex", entry.getName());
+ }
+ index++;
+ }
+ // Everything else should be sorted according to name.
+ String[] entriesUnsorted = entryNames.toArray(new String[0]);
+ String[] entriesSorted = entryNames.toArray(new String[0]);
+ Arrays.sort(entriesSorted);
+ Assert.assertArrayEquals(entriesUnsorted, entriesSorted);
}
private boolean isLambda(String mainDexEntry) {
diff --git a/src/test/java/com/android/tools/r8/regress/b118075510/Regress118075510Runner.java b/src/test/java/com/android/tools/r8/regress/b118075510/Regress118075510Runner.java
new file mode 100644
index 0000000..12bd452
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/regress/b118075510/Regress118075510Runner.java
@@ -0,0 +1,54 @@
+// Copyright (c) 2018, 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.regress.b118075510;
+
+import com.android.tools.r8.AsmTestBase;
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.D8TestCompileResult;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import com.android.tools.r8.utils.codeinspector.MethodSubject;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class Regress118075510Runner extends AsmTestBase {
+
+ public static final Class<?> CLASS = Regress118075510Test.class;
+ public static final String EXPECTED = StringUtils.lines("0", "0");
+
+ @Test
+ public void test()
+ throws CompilationFailedException, IOException, ExecutionException, NoSuchMethodException {
+ testForJvm().addTestClasspath().run(CLASS).assertSuccessWithOutput(EXPECTED);
+
+ D8TestCompileResult d8Result =
+ testForD8().addProgramClasses(CLASS).setMinApi(AndroidApiLevel.M).release().compile();
+
+ CodeInspector inspector = d8Result.inspector();
+ checkMethodContainsLongSignum(inspector, "fooNoTryCatch");
+ checkMethodContainsLongSignum(inspector, "fooWithTryCatch");
+ // Check the program runs on ART/Dalvik
+ d8Result.run(CLASS).assertSuccessWithOutput(EXPECTED);
+ // Check the program can be dex2oat compiled to arm64. This will diverge without the fixup.
+ d8Result.runDex2Oat().assertSuccess();
+ }
+
+ private void checkMethodContainsLongSignum(CodeInspector inspector, String methodName)
+ throws NoSuchMethodException {
+ MethodSubject method = inspector.method(CLASS.getMethod(methodName, long.class, long.class));
+ Assert.assertTrue(
+ "Did not contain Long.signum workaround in "
+ + methodName
+ + ":\n"
+ + method.getMethod().codeToString(),
+ method
+ .streamInstructions()
+ .anyMatch(
+ i ->
+ i.isInvoke() && i.getMethod().qualifiedName().equals("java.lang.Long.signum")));
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/regress/b118075510/Regress118075510Test.java b/src/test/java/com/android/tools/r8/regress/b118075510/Regress118075510Test.java
new file mode 100644
index 0000000..cc4dece
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/regress/b118075510/Regress118075510Test.java
@@ -0,0 +1,38 @@
+// Copyright (c) 2018, 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.regress.b118075510;
+
+public class Regress118075510Test {
+
+ public static void fooNoTryCatch(long a, long b) {
+ // Call a method on the runner class that will not be on the classpath at runtime.
+ // This causes the optimizing 6.0.1 compiler to delegate to the old quick compiler.
+ if (a == b) Regress118075510Runner.class.getMethods();
+ // The else branch of the conditional here ends up with an invalid previous pointer at its
+ // block header (ie, previous of mul-long (2addr) points to epilogue-end which is self-linked.
+ System.out.println(a < b ? 0 : a * b + b);
+ }
+
+ public static void fooWithTryCatch(long a, long b) {
+ // Call a method on the runner class that will not be on the classpath at runtime.
+ // This causes the optimizing 6.0.1 compiler to delegate to the old quick compiler.
+ if (a == b) Regress118075510Runner.class.getMethods();
+ // The else branch of the conditional here ends up with an invalid previous pointer at its
+ // block header (ie, previous of mul-long (2addr) points to epilogue-end which is self-linked.
+ try {
+ if (a < b) {
+ System.out.println((long) 0);
+ } else {
+ System.out.println(a * b + b);
+ }
+ } catch (RuntimeException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+ fooNoTryCatch(args.length, 456);
+ fooWithTryCatch(456, args.length);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/regress/b77842465/Regress77842465.java b/src/test/java/com/android/tools/r8/regress/b77842465/Regress77842465.java
index cbc6e1b..3ab3467 100644
--- a/src/test/java/com/android/tools/r8/regress/b77842465/Regress77842465.java
+++ b/src/test/java/com/android/tools/r8/regress/b77842465/Regress77842465.java
@@ -5,29 +5,20 @@
import com.android.tools.r8.AsmTestBase;
import com.android.tools.r8.CompilationFailedException;
-import com.android.tools.r8.D8;
-import com.android.tools.r8.D8Command;
-import com.android.tools.r8.OutputMode;
-import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.origin.Origin;
+import com.android.tools.r8.utils.AndroidApiLevel;
import java.io.IOException;
-import java.nio.file.Path;
import org.junit.Test;
public class Regress77842465 extends AsmTestBase {
@Test
public void test() throws CompilationFailedException, IOException {
-
- Path dexOut = temp.getRoot().toPath().resolve("out.jar");
- Path oatOut = temp.getRoot().toPath().resolve("out.odex");
-
- D8.run(D8Command.builder()
- .addClassProgramData(Regress77842465Dump.dump(), Origin.unknown())
- .setOutput(dexOut, OutputMode.DexIndexed)
- .setDisableDesugaring(true)
- .build());
-
- ToolHelper.runDex2Oat(dexOut, oatOut);
+ testForD8()
+ .addProgramClassFileData(Regress77842465Dump.dump())
+ .noDesugaring()
+ .setMinApi(AndroidApiLevel.M)
+ .compile()
+ .runDex2Oat()
+ .assertSuccess();
}
}
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
new file mode 100644
index 0000000..a7bdf0b
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
@@ -0,0 +1,117 @@
+// Copyright (c) 2018, 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.shaking.annotations;
+
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NeverMerge;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.utils.StringUtils;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class AnnotationsOnTargetedMethodTest extends TestBase {
+
+ private static final String expectedOutput =
+ StringUtils.lines(
+ "In InterfaceImpl.targetedMethod()",
+ "In OtherInterfaceImpl.targetedMethod()",
+ MyAnnotation.class.getName());
+
+ private final Backend backend;
+
+ @Parameters(name = "Backend: {0}")
+ public static Backend[] data() {
+ return Backend.values();
+ }
+
+ public AnnotationsOnTargetedMethodTest(Backend backend) {
+ this.backend = backend;
+ }
+
+ @Test
+ public void jvmTest() throws Exception {
+ assumeTrue(
+ "JVM test independent of Art version - only run when testing on latest",
+ ToolHelper.getDexVm().getVersion().isLatest());
+ testForJvm().addTestClasspath().run(TestClass.class).assertSuccessWithOutput(expectedOutput);
+ }
+
+ @Test
+ public void r8Test() throws Exception {
+ testForR8(backend)
+ .addInnerClasses(AnnotationsOnTargetedMethodTest.class)
+ .addKeepMainRule(TestClass.class)
+ .addKeepRules("-keepattributes *Annotation*", "-dontobfuscate")
+ .enableInliningAnnotations()
+ .enableMergeAnnotations()
+ .run(TestClass.class)
+ .assertSuccessWithOutput(expectedOutput);
+ }
+
+ static class TestClass {
+
+ public static void main(String[] args) {
+ test(new InterfaceImpl());
+ test(new OtherInterfaceImpl());
+
+ Method method = Interface.class.getDeclaredMethods()[0];
+ for (Annotation annotation : method.getAnnotations()) {
+ visitAnnotation((MyAnnotation) annotation);
+ }
+ }
+
+ @NeverInline
+ private static void test(Interface obj) {
+ obj.targetedMethod();
+ }
+
+ @NeverInline
+ private static void visitAnnotation(MyAnnotation annotation) {
+ System.out.println(annotation.annotationType().getName());
+ }
+ }
+
+ @NeverMerge
+ interface Interface {
+
+ @NeverInline
+ @MyAnnotation
+ void targetedMethod();
+ }
+
+ static class InterfaceImpl implements Interface {
+
+ @NeverInline
+ @Override
+ public void targetedMethod() {
+ System.out.println("In InterfaceImpl.targetedMethod()");
+ }
+ }
+
+ static class OtherInterfaceImpl implements Interface {
+
+ @NeverInline
+ @Override
+ public void targetedMethod() {
+ System.out.println("In OtherInterfaceImpl.targetedMethod()");
+ }
+ }
+
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target({ElementType.METHOD})
+ @interface MyAnnotation {}
+}
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/classinlining/IfRuleWithClassInlining.java b/src/test/java/com/android/tools/r8/shaking/ifrule/classinlining/IfRuleWithClassInlining.java
new file mode 100644
index 0000000..caa06d3
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/classinlining/IfRuleWithClassInlining.java
@@ -0,0 +1,106 @@
+// Copyright (c) 2018, 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.shaking.ifrule.classinlining;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.utils.BooleanUtils;
+import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class IfRuleWithClassInlining extends TestBase {
+
+ private final Backend backend;
+ private final boolean enableClassInlining;
+ private final boolean enableIfRule;
+
+ public IfRuleWithClassInlining(
+ Backend backend, boolean enableClassInlining, boolean enableIfRule) {
+ this.backend = backend;
+ this.enableClassInlining = enableClassInlining;
+ this.enableIfRule = enableIfRule;
+ }
+
+ @Parameters(name = "Backend: {0}, class inlining: {1}, with if rule: {2}")
+ public static List<Object[]> data() {
+ return buildParameters(Backend.values(), BooleanUtils.values(), BooleanUtils.values());
+ }
+
+ @Test
+ public void r8Test() throws Exception {
+ String ifRule =
+ StringUtils.lines(
+ "-if class " + StringBox.Builder.class.getTypeName(),
+ "-keep class " + Unused.class.getTypeName());
+ CodeInspector inspector =
+ testForR8(backend)
+ .addInnerClasses(IfRuleWithClassInlining.class)
+ .addKeepMainRule(TestClass.class)
+ // TODO(b/120061431): Should not be needed for this example.
+ .addKeepRules("-allowaccessmodification")
+ .addKeepRules(enableIfRule ? ifRule : "")
+ .addOptionsModification(options -> options.enableClassInlining = enableClassInlining)
+ .compile()
+ .inspector();
+ if (enableIfRule || !enableClassInlining) {
+ assertThat(inspector.clazz(StringBox.Builder.class), isPresent());
+ } else {
+ assertThat(inspector.clazz(StringBox.Builder.class), not(isPresent()));
+ }
+ if (enableIfRule) {
+ assertThat(inspector.clazz(Unused.class), isPresent());
+ }
+ }
+
+ static class TestClass {
+
+ public static void main(String[] args) {
+ StringBox box = StringBox.builder().setString("Hello world").build();
+ System.out.println(box.getString());
+ }
+ }
+
+ static class StringBox {
+
+ static class Builder {
+
+ private String string = null;
+
+ public Builder setString(String string) {
+ this.string = string;
+ return this;
+ }
+
+ public StringBox build() {
+ return new StringBox(string);
+ }
+ }
+
+ private final String string;
+
+ public StringBox(String string) {
+ this.string = string;
+ }
+
+ public String getString() {
+ return string;
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+ }
+
+ static class Unused {}
+}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/MethodSubject.java b/src/test/java/com/android/tools/r8/utils/codeinspector/MethodSubject.java
index 1e21552..98bb8d0 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/MethodSubject.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/MethodSubject.java
@@ -5,8 +5,10 @@
package com.android.tools.r8.utils.codeinspector;
import com.android.tools.r8.graph.DexEncodedMethod;
+import com.google.common.collect.Streams;
import java.util.Iterator;
import java.util.function.Predicate;
+import java.util.stream.Stream;
public abstract class MethodSubject extends MemberSubject {
@@ -40,4 +42,8 @@
public abstract LineNumberTable getLineNumberTable();
public abstract boolean hasLocalVariableTable();
+
+ public Stream<InstructionSubject> streamInstructions() {
+ return Streams.stream(iterateInstructions());
+ }
}
