Merge "Update test to run on older Art versions"
diff --git a/build.gradle b/build.gradle
index 58b0aaf..60357de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@
apply from: 'copyAdditionalJctfCommonFiles.gradle'
repositories {
+ maven { url 'https://maven.google.com' }
mavenCentral()
}
@@ -94,6 +95,10 @@
}
}
+configurations {
+ supportLibs
+}
+
dependencies {
compile 'net.sf.jopt-simple:jopt-simple:4.6'
compile group: 'com.google.guava', name: 'guava', version: '19.0'
@@ -114,6 +119,9 @@
examplesAndroidOCompile group: 'org.ow2.asm', name: 'asm', version: '5.1'
examplesCompile 'com.google.protobuf:protobuf-lite:3.0.0'
examplesRuntime 'com.google.protobuf:protobuf-lite:3.0.0'
+ supportLibs 'com.android.support:support-v4:25.4.0'
+ supportLibs 'junit:junit:4.12'
+ supportLibs 'com.android.support.test.espresso:espresso-core:3.0.0'
}
protobuf {
@@ -526,7 +534,7 @@
classpath = sourceSets.examples.compileClasspath
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
- options.compilerArgs += ["-Xlint:-options"]
+ options.compilerArgs = ["-Xlint:none"]
}
examplesDir.eachDir { dir ->
def name = dir.getName();
@@ -791,7 +799,57 @@
includeEmptyDirs = false
}
+task supportLibDir() {
+ doLast {
+ File dir = file("build/supportlibraries")
+ dir.mkdir()
+ }
+}
+
+configurations.supportLibs.files.each { file ->
+ if (file.getName().endsWith(".aar")) {
+ def name = "extract_"+file.getName()
+ task "${name}"(type: Copy) {
+ dependsOn supportLibDir
+ from zipTree(file)
+ into "build/supportlibraries"
+ eachFile { FileCopyDetails fcp ->
+ if (fcp.relativePath.pathString.equals("classes.jar")) {
+ // remap the file to the root with correct name
+ fcp.relativePath = new RelativePath(true, file.getName().replace(".aar", ".jar"))
+ } else {
+ fcp.exclude()
+ }
+ }
+ }
+ }
+}
+
+task supportLibList() {
+ configurations.supportLibs.files.each {
+ if (it.getName().endsWith(".aar")) {
+ dependsOn "extract_"+it.getName()
+ }
+ }
+ doLast {
+ file("build/generated").mkdir()
+ def file = file("build/generated/supportlibraries.txt")
+ file.createNewFile()
+ file.text = ""
+ configurations.supportLibs.files.each {
+ if (it.getName().endsWith(".aar")) {
+ def outName = it.getName().replace(".aar", ".jar")
+ file.text += ("build/supportlibraries/"
+ + outName + "\n")
+ } else {
+ file.text += (it.getPath() + "\n")
+ }
+ }
+ }
+}
+
test {
+ dependsOn supportLibList
testLogging.exceptionFormat = 'full'
if (project.hasProperty('print_test_stdout')) {
testLogging.showStandardStreams = true
diff --git a/src/main/java/com/android/tools/r8/BaseCommand.java b/src/main/java/com/android/tools/r8/BaseCommand.java
index ec4f527..430624b 100644
--- a/src/main/java/com/android/tools/r8/BaseCommand.java
+++ b/src/main/java/com/android/tools/r8/BaseCommand.java
@@ -219,9 +219,53 @@
return self();
}
- /** Set the main-dex list file. */
- public B setMainDexListFile(Path file) {
- app.setMainDexListFile(file);
+ /**
+ * Add main-dex list files.
+ *
+ * Each line in each of the files specifies one class to keep in the primary dex file
+ * (<code>classes.dex</code>).
+ *
+ * A class is specified using the following format: "com/example/MyClass.class". That is
+ * "/" as separator between package components, and a trailing ".class".
+ */
+ public B addMainDexListFiles(Path... files) throws IOException {
+ app.addMainDexListFiles(files);
+ return self();
+ }
+
+ /**
+ * Add main-dex list files.
+ *
+ * @see #addMainDexListFiles(Path...)
+ */
+ public B addMainDexListFiles(Collection<Path> files) throws IOException {
+ app.addMainDexListFiles(files);
+ return self();
+ }
+
+ /**
+ * Add main-dex classes.
+ *
+ * Add classes to keep in the primary dex file (<code>classes.dex</code>).
+ *
+ * NOTE: The name of the classes is specified using the Java fully qualified names format
+ * (e.g. "com.example.MyClass"), and <i>not</i> the format used by the main-dex list file.
+ */
+ public B addMainDexClasses(String... classes) {
+ app.addMainDexClasses(classes);
+ return self();
+ }
+
+ /**
+ * Add main-dex classes.
+ *
+ * Add classes to keep in the primary dex file (<code>classes.dex</code>).
+ *
+ * NOTE: The name of the classes is specified using the Java fully qualified names format
+ * (e.g. "com.example.MyClass"), and <i>not</i> the format used by the main-dex list file.
+ */
+ public B addMainDexClasses(Collection<String> classes) {
+ app.addMainDexClasses(classes);
return self();
}
@@ -248,6 +292,10 @@
}
protected void validate() throws CompilationException {
+ if (app.hasMainDexList() && outputMode == OutputMode.FilePerClass) {
+ throw new CompilationException(
+ "Option --main-dex-list cannot be used with --file-per-class");
+ }
FileUtils.validateOutputFile(outputPath);
}
}
diff --git a/src/main/java/com/android/tools/r8/BaseOutput.java b/src/main/java/com/android/tools/r8/BaseOutput.java
index b1b9166..48e2309 100644
--- a/src/main/java/com/android/tools/r8/BaseOutput.java
+++ b/src/main/java/com/android/tools/r8/BaseOutput.java
@@ -43,7 +43,7 @@
* @return an immutable list of compiled DEX resources.
*/
public List<Resource> getDexResources() {
- return ImmutableList.copyOf(app.getDexProgramResources());
+ return ImmutableList.copyOf(app.getDexProgramResourcesForOutput());
}
/**
diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java
index 6988b06..bca7a9f 100644
--- a/src/main/java/com/android/tools/r8/D8.java
+++ b/src/main/java/com/android/tools/r8/D8.java
@@ -8,6 +8,7 @@
import com.android.tools.r8.dex.ApplicationReader;
import com.android.tools.r8.dex.ApplicationWriter;
import com.android.tools.r8.errors.CompilationError;
+import com.android.tools.r8.errors.MainDexError;
import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.DexApplication;
import com.android.tools.r8.ir.conversion.IRConverter;
@@ -151,7 +152,7 @@
}
}
- static CompilationResult runForTesting(
+ private static CompilationResult runForTesting(
AndroidApp inputApp, InternalOptions options, ExecutorService executor) throws IOException {
try {
assert !inputApp.hasPackageDistribution();
@@ -184,12 +185,13 @@
options.printWarnings();
return output;
+ } catch (MainDexError mainDexError) {
+ throw new CompilationError(mainDexError.getMessageForD8());
} catch (ExecutionException e) {
if (e.getCause() instanceof CompilationError) {
throw (CompilationError) e.getCause();
- } else {
- throw new RuntimeException(e.getMessage(), e.getCause());
}
+ throw new RuntimeException(e.getMessage(), e.getCause());
}
}
diff --git a/src/main/java/com/android/tools/r8/D8Command.java b/src/main/java/com/android/tools/r8/D8Command.java
index 6ac5f1e..4c9b542 100644
--- a/src/main/java/com/android/tools/r8/D8Command.java
+++ b/src/main/java/com/android/tools/r8/D8Command.java
@@ -71,6 +71,14 @@
return this;
}
+ protected void validate() throws CompilationException {
+ super.validate();
+ if (getAppBuilder().hasMainDexList() && intermediate) {
+ throw new CompilationException(
+ "Option --main-dex-list cannot be used with --intermediate");
+ }
+ }
+
/**
* Build the final D8Command.
*/
@@ -95,17 +103,19 @@
"Usage: d8 [options] <input-files>",
" where <input-files> are any combination of dex, class, zip, jar, or apk files",
" and options are:",
- " --debug # Compile with debugging information (default).",
- " --release # Compile without debugging information.",
- " --output <file> # Output result in <outfile>.",
- " # <file> must be an existing directory or a zip file.",
- " --lib <file> # Add <file> as a library resource.",
- " --classpath <file> # Add <file> as a classpath resource.",
- " --min-api # Minimum Android API level compatibility",
- " --intermediate # Compile an intermediate result intended for later merging.",
- " --file-per-class # Produce a separate dex file per class",
- " --version # Print the version of d8.",
- " --help # Print this message."));
+ " --debug # Compile with debugging information (default).",
+ " --release # Compile without debugging information.",
+ " --output <file> # Output result in <outfile>.",
+ " # <file> must be an existing directory or a zip file.",
+ " --lib <file> # Add <file> as a library resource.",
+ " --classpath <file> # Add <file> as a classpath resource.",
+ " --min-api # Minimum Android API level compatibility",
+ " --intermediate # Compile an intermediate result intended for later",
+ " # merging.",
+ " --file-per-class # Produce a separate dex file per class",
+ " --main-dex-list <file> # List of classes to place in the primary dex file.",
+ " --version # Print the version of d8.",
+ " --help # Print this message."));
private boolean intermediate = false;
@@ -156,6 +166,8 @@
builder.addLibraryFiles(Paths.get(args[++i]));
} else if (arg.equals("--classpath")) {
builder.addClasspathFiles(Paths.get(args[++i]));
+ } else if (arg.equals("--main-dex-list")) {
+ builder.addMainDexListFiles(Paths.get(args[++i]));
} else if (arg.equals("--min-api")) {
builder.setMinApiLevel(Integer.valueOf(args[++i]));
} else if (arg.equals("--intermediate")) {
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index 19fc358..5f56d79 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -9,6 +9,7 @@
import com.android.tools.r8.dex.ApplicationWriter;
import com.android.tools.r8.dex.Constants;
import com.android.tools.r8.errors.CompilationError;
+import com.android.tools.r8.errors.MainDexError;
import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.ClassAndMemberPublicizer;
@@ -16,6 +17,8 @@
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.graph.GraphLense;
import com.android.tools.r8.ir.conversion.IRConverter;
+import com.android.tools.r8.ir.optimize.EnumOrdinalMapCollector;
+import com.android.tools.r8.ir.optimize.SwitchMapCollector;
import com.android.tools.r8.naming.Minifier;
import com.android.tools.r8.naming.NamingLens;
import com.android.tools.r8.optimize.BridgeMethodAnalysis;
@@ -35,6 +38,7 @@
import com.android.tools.r8.shaking.RootSetBuilder.RootSet;
import com.android.tools.r8.shaking.SimpleClassMerger;
import com.android.tools.r8.shaking.TreePruner;
+import com.android.tools.r8.shaking.protolite.ProtoLiteExtension;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.CfgPrinter;
import com.android.tools.r8.utils.FileUtils;
@@ -240,6 +244,7 @@
}
rootSet = new RootSetBuilder(application, appInfo, options.keepRules).run(executorService);
Enqueuer enqueuer = new Enqueuer(appInfo);
+ enqueuer.addExtension(new ProtoLiteExtension(appInfo));
appInfo = enqueuer.traceApplication(rootSet, timing);
if (options.printSeeds) {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@@ -269,8 +274,7 @@
GraphLense graphLense = GraphLense.getIdentityLense();
- if (appInfo.withLiveness() != null) {
- // No-op until class merger is added.
+ if (appInfo.hasLiveness()) {
graphLense = new MemberRebindingAnalysis(appInfo.withLiveness(), graphLense).run();
// Class merging requires inlining.
if (!options.skipClassMerging && options.inlineAccessors) {
@@ -281,6 +285,9 @@
}
appInfo = appInfo.withLiveness().prunedCopyFrom(application);
appInfo = appInfo.withLiveness().rewrittenWithLense(graphLense);
+ // Collect switch maps and ordinals maps.
+ new SwitchMapCollector(appInfo.withLiveness(), options).run();
+ new EnumOrdinalMapCollector(appInfo.withLiveness(), options).run();
}
graphLense = new BridgeMethodAnalysis(graphLense, appInfo.withSubtyping()).run();
@@ -363,12 +370,13 @@
options.printWarnings();
return new CompilationResult(androidApp, application, appInfo);
+ } catch (MainDexError mainDexError) {
+ throw new CompilationError(mainDexError.getMessageForR8());
} catch (ExecutionException e) {
if (e.getCause() instanceof CompilationError) {
throw (CompilationError) e.getCause();
- } else {
- throw new RuntimeException(e.getMessage(), e.getCause());
}
+ throw new RuntimeException(e.getMessage(), e.getCause());
} finally {
// Dump timings.
if (options.printTimes) {
@@ -424,7 +432,7 @@
outputApp.writeProguardSeeds(closer, seedsOut);
}
}
- if (options.printMainDexList && outputApp.hasMainDexList()) {
+ if (outputApp.hasMainDexListOutput()) {
try (Closer closer = Closer.create()) {
OutputStream mainDexOut =
FileUtils.openPathWithDefault(
diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index 3b88ba8..241ea85 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -27,6 +27,7 @@
private final List<Path> mainDexRules = new ArrayList<>();
private boolean minimalMainDex = false;
+ private Path mainDexListOutput = null;
private final List<Path> proguardConfigFiles = new ArrayList<>();
private Optional<Boolean> treeShaking = Optional.empty();
private Optional<Boolean> minification = Optional.empty();
@@ -87,6 +88,12 @@
minimalMainDex = value;
return self();
}
+
+ public Builder setMainDexListOutputPath(Path mainDexListOutputPath) {
+ mainDexListOutput = mainDexListOutputPath;
+ return self();
+ }
+
/**
* Add proguard configuration file resources.
*/
@@ -129,6 +136,18 @@
return self();
}
+ protected void validate() throws CompilationException {
+ super.validate();
+ if (minimalMainDex && mainDexRules.isEmpty() && !getAppBuilder().hasMainDexList()) {
+ throw new CompilationException(
+ "Option --minimal-main-dex require --main-dex-rules and/or --main-dex-list");
+ }
+ if (mainDexListOutput != null && mainDexRules.isEmpty() && !getAppBuilder().hasMainDexList()) {
+ throw new CompilationException(
+ "Option --main-dex-list-output require --main-dex-rules and/or --main-dex-list");
+ }
+ }
+
@Override
public R8Command build() throws CompilationException, IOException {
// If printing versions ignore everything else.
@@ -174,6 +193,7 @@
getOutputMode(),
mainDexKeepRules,
minimalMainDex,
+ mainDexListOutput,
configuration,
getMode(),
getMinApiLevel(),
@@ -193,23 +213,29 @@
"Usage: r8 [options] <input-files>",
" where <input-files> are any combination of dex, class, zip, jar, or apk files",
" and options are:",
- " --release # Compile without debugging information (default).",
- " --debug # Compile with debugging information.",
- " --output <file> # Output result in <file>.",
- " # <file> must be an existing directory or a zip file.",
- " --lib <file> # Add <file> as a library resource.",
- " --min-api # Minimum Android API level compatibility.",
- " --pg-conf <file> # Proguard configuration <file> (implies tree shaking/minification).",
- " --pg-map <file> # Proguard map <file>.",
- " --no-tree-shaking # Force disable tree shaking of unreachable classes.",
- " --no-minification # Force disable minification of names.",
- " --multidex-rules <file> # Enable automatic classes partitioning for legacy multidex.",
- " # <file> is a Proguard configuration file (with only keep rules).",
- " --version # Print the version of r8.",
- " --help # Print this message."));
+ " --release # Compile without debugging information (default).",
+ " --debug # Compile with debugging information.",
+ " --output <file> # Output result in <file>.",
+ " # <file> must be an existing directory or a zip file.",
+ " --lib <file> # Add <file> as a library resource.",
+ " --min-api # Minimum Android API level compatibility.",
+ " --pg-conf <file> # Proguard configuration <file> (implies tree",
+ " # shaking/minification).",
+ " --pg-map <file> # Proguard map <file>.",
+ " --no-tree-shaking # Force disable tree shaking of unreachable classes.",
+ " --no-minification # Force disable minification of names.",
+ " --main-dex-rules <file> # Proguard keep rules for classes to place in the",
+ " # primary dex file.",
+ " --main-dex-list <file> # List of classes to place in the primary dex file.",
+ " --minimal-main-dex # Only place classes specified by --main-dex-rules",
+ " # in the primary dex file.",
+ " --main-dex-list-output <file> # Output the full main-dex list in <file>.",
+ " --version # Print the version of r8.",
+ " --help # Print this message."));
private final ImmutableList<ProguardConfigurationRule> mainDexKeepRules;
private final boolean minimalMainDex;
+ private final Path mainDexListOutput;
private final ProguardConfiguration proguardConfiguration;
private final boolean useTreeShaking;
private final boolean useMinification;
@@ -271,10 +297,14 @@
builder.setTreeShaking(false);
} else if (arg.equals("--no-minification")) {
builder.setMinification(false);
- } else if (arg.equals("--multidex-rules")) {
+ } else if (arg.equals("--main-dex-rules")) {
builder.addMainDexRules(Paths.get(args[++i]));
- } else if (arg.equals("--minimal-maindex")) {
+ } else if (arg.equals("--main-dex-list")) {
+ builder.addMainDexListFiles(Paths.get(args[++i]));
+ } else if (arg.equals("--minimal-main-dex")) {
builder.setMinimalMainDex(true);
+ } else if (arg.equals("--main-dex-list-output")) {
+ builder.setMainDexListOutputPath(Paths.get(args[++i]));
} else if (arg.equals("--pg-conf")) {
builder.addProguardConfigurationFiles(Paths.get(args[++i]));
} else if (arg.equals("--pg-map")) {
@@ -317,6 +347,7 @@
OutputMode outputMode,
ImmutableList<ProguardConfigurationRule> mainDexKeepRules,
boolean minimalMainDex,
+ Path mainDexListOutput,
ProguardConfiguration proguardConfiguration,
CompilationMode mode,
int minApiLevel,
@@ -329,6 +360,7 @@
assert getOutputMode() == OutputMode.Indexed : "Only regular mode is supported in R8";
this.mainDexKeepRules = mainDexKeepRules;
this.minimalMainDex = minimalMainDex;
+ this.mainDexListOutput = mainDexListOutput;
this.proguardConfiguration = proguardConfiguration;
this.useTreeShaking = useTreeShaking;
this.useMinification = useMinification;
@@ -339,6 +371,7 @@
super(printHelp, printVersion);
mainDexKeepRules = ImmutableList.of();
minimalMainDex = false;
+ mainDexListOutput = null;
proguardConfiguration = null;
useTreeShaking = false;
useMinification = false;
@@ -398,6 +431,9 @@
internal.obfuscationDictionary = proguardConfiguration.getObfuscationDictionary();
internal.mainDexKeepRules = mainDexKeepRules;
internal.minimalMainDex = minimalMainDex;
+ if (mainDexListOutput != null) {
+ internal.printMainDexListFile = mainDexListOutput;
+ }
internal.keepRules = proguardConfiguration.getRules();
internal.dontWarnPatterns = proguardConfiguration.getDontWarnPatterns();
internal.outputMode = getOutputMode();
diff --git a/src/main/java/com/android/tools/r8/Resource.java b/src/main/java/com/android/tools/r8/Resource.java
index 3208e52..15b5dd1 100644
--- a/src/main/java/com/android/tools/r8/Resource.java
+++ b/src/main/java/com/android/tools/r8/Resource.java
@@ -18,7 +18,7 @@
DEX, CLASSFILE
}
- private Resource(Kind kind) {
+ protected Resource(Kind kind) {
this.kind = kind;
}
diff --git a/src/main/java/com/android/tools/r8/code/FillArrayDataPayload.java b/src/main/java/com/android/tools/r8/code/FillArrayDataPayload.java
index 0fb8f1e..1f69d9c 100644
--- a/src/main/java/com/android/tools/r8/code/FillArrayDataPayload.java
+++ b/src/main/java/com/android/tools/r8/code/FillArrayDataPayload.java
@@ -26,7 +26,7 @@
int numberOfShorts = (int) (size * element_width + 1) / 2;
data = new short[numberOfShorts];
for (int i = 0; i < data.length; i++) {
- data[i] = (short) readSigned16BitValue(stream);
+ data[i] = readSigned16BitValue(stream);
}
}
diff --git a/src/main/java/com/android/tools/r8/code/Format10t.java b/src/main/java/com/android/tools/r8/code/Format10t.java
index ee2e6fa..840efae 100644
--- a/src/main/java/com/android/tools/r8/code/Format10t.java
+++ b/src/main/java/com/android/tools/r8/code/Format10t.java
@@ -10,7 +10,7 @@
abstract class Format10t extends Base1Format {
- public final /* offset */ int AA;
+ public final /* offset */ byte AA;
// +AA | op
Format10t(int high, BytecodeStream stream) {
@@ -21,7 +21,7 @@
protected Format10t(int AA) {
assert Byte.MIN_VALUE <= AA && AA <= Byte.MAX_VALUE;
- this.AA = AA;
+ this.AA = (byte) AA;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format11n.java b/src/main/java/com/android/tools/r8/code/Format11n.java
index 561c7c9..eca95ce 100644
--- a/src/main/java/com/android/tools/r8/code/Format11n.java
+++ b/src/main/java/com/android/tools/r8/code/Format11n.java
@@ -11,26 +11,26 @@
abstract class Format11n extends Base1Format {
- public final int A, B;
+ public final byte A, B;
// #+B | vA | op
/*package*/ Format11n(int high, BytecodeStream stream) {
super(stream);
- A = high & 0xf;
+ A = (byte) (high & 0xf);
// Sign extend 4bit value.
high >>= 4;
if ((high & Constants.S4BIT_SIGN_MASK) != 0) {
- B = ~(~high & 0xf);
+ B = (byte) (~(~high & 0xf));
} else {
- B = high & 0xf;
+ B = (byte) (high & 0xf);
}
}
/*package*/ Format11n(int A, int B) {
assert 0 <= A && A <= Constants.U4BIT_MAX;
assert Constants.S4BIT_MIN <= B && B <= Constants.S4BIT_MAX;
- this.A = A;
- this.B = B;
+ this.A = (byte) A;
+ this.B = (byte) B;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format11x.java b/src/main/java/com/android/tools/r8/code/Format11x.java
index baf4b57..f49e265 100644
--- a/src/main/java/com/android/tools/r8/code/Format11x.java
+++ b/src/main/java/com/android/tools/r8/code/Format11x.java
@@ -11,17 +11,17 @@
abstract class Format11x extends Base1Format {
- public final int AA;
+ public final short AA;
// vAA | op
Format11x(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
}
protected Format11x(int AA) {
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
- this.AA = AA;
+ this.AA = (short) AA;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format12x.java b/src/main/java/com/android/tools/r8/code/Format12x.java
index 4338b46..54d5f27 100644
--- a/src/main/java/com/android/tools/r8/code/Format12x.java
+++ b/src/main/java/com/android/tools/r8/code/Format12x.java
@@ -11,20 +11,20 @@
abstract class Format12x extends Base1Format {
- public final int A, B;
+ public final byte A, B;
// vB | vA | op
Format12x(int high, BytecodeStream stream) {
super(stream);
- A = high & 0xF;
- B = (high >> 4) & 0xF;
+ A = (byte) (high & 0xF);
+ B = (byte) ((high >> 4) & 0xF);
}
Format12x(int A, int B) {
assert 0 <= A && A <= Constants.U4BIT_MAX;
assert 0 <= B && B <= Constants.U4BIT_MAX;
- this.A = A;
- this.B = B;
+ this.A = (byte) A;
+ this.B = (byte) B;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format20t.java b/src/main/java/com/android/tools/r8/code/Format20t.java
index 4f6f235..89d740b 100644
--- a/src/main/java/com/android/tools/r8/code/Format20t.java
+++ b/src/main/java/com/android/tools/r8/code/Format20t.java
@@ -10,7 +10,7 @@
abstract class Format20t extends Base2Format {
- public final /* offset */ int AAAA;
+ public final /* offset */ short AAAA;
// øø | op | +AAAA
Format20t(int high, BytecodeStream stream) {
@@ -20,7 +20,7 @@
protected Format20t(int AAAA) {
assert Short.MIN_VALUE <= AAAA && AAAA <= Short.MAX_VALUE;
- this.AAAA = AAAA;
+ this.AAAA = (short) AAAA;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format21c.java b/src/main/java/com/android/tools/r8/code/Format21c.java
index 411bc02..dfa6926 100644
--- a/src/main/java/com/android/tools/r8/code/Format21c.java
+++ b/src/main/java/com/android/tools/r8/code/Format21c.java
@@ -13,19 +13,19 @@
abstract class Format21c extends Base2Format {
- public final int AA;
+ public final short AA;
public IndexedDexItem BBBB;
// AA | op | [type|field|string]@BBBB
Format21c(int high, BytecodeStream stream, IndexedDexItem[] map) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBB = map[read16BitValue(stream)];
}
protected Format21c(int AA, IndexedDexItem BBBB) {
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
- this.AA = AA;
+ this.AA = (short) AA;
this.BBBB = BBBB;
}
diff --git a/src/main/java/com/android/tools/r8/code/Format21h.java b/src/main/java/com/android/tools/r8/code/Format21h.java
index 5f3f247..420617a 100644
--- a/src/main/java/com/android/tools/r8/code/Format21h.java
+++ b/src/main/java/com/android/tools/r8/code/Format21h.java
@@ -10,21 +10,21 @@
abstract class Format21h extends Base2Format {
- public final int AA;
- public final int BBBB;
+ public final short AA;
+ public final char BBBB;
// AA | op | BBBB0000[00000000]
/*package*/ Format21h(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBB = read16BitValue(stream);
}
/*package*/ Format21h(int AA, int BBBB) {
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
assert 0 <= BBBB && BBBB <= Constants.U16BIT_MAX;
- this.AA = AA;
- this.BBBB = BBBB;
+ this.AA = (short) AA;
+ this.BBBB = (char) BBBB;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format21s.java b/src/main/java/com/android/tools/r8/code/Format21s.java
index 79d15ab..db148bd 100644
--- a/src/main/java/com/android/tools/r8/code/Format21s.java
+++ b/src/main/java/com/android/tools/r8/code/Format21s.java
@@ -12,21 +12,21 @@
abstract class Format21s extends Base2Format {
- public final int AA;
- public final int BBBB;
+ public final short AA;
+ public final short BBBB;
// AA | op | #+BBBB
/*package*/ Format21s(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBB = readSigned16BitValue(stream);
}
/*package*/ Format21s(int AA, int BBBB) {
assert Short.MIN_VALUE <= BBBB && BBBB <= Short.MAX_VALUE;
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
- this.AA = AA;
- this.BBBB = BBBB;
+ this.AA = (short) AA;
+ this.BBBB = (short) BBBB;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format21t.java b/src/main/java/com/android/tools/r8/code/Format21t.java
index a49abb5..12b752b 100644
--- a/src/main/java/com/android/tools/r8/code/Format21t.java
+++ b/src/main/java/com/android/tools/r8/code/Format21t.java
@@ -13,21 +13,21 @@
abstract class Format21t extends Base2Format {
- public final int AA;
- public final /* offset */ int BBBB;
+ public final short AA;
+ public final /* offset */ short BBBB;
// AA | op | +BBBB
Format21t(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBB = readSigned16BitValue(stream);
}
Format21t(int register, int offset) {
assert Short.MIN_VALUE <= offset && offset <= Short.MAX_VALUE;
assert 0 <= register && register <= Constants.U8BIT_MAX;
- AA = register;
- BBBB = offset;
+ AA = (short) register;
+ BBBB = (short) offset;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format22b.java b/src/main/java/com/android/tools/r8/code/Format22b.java
index a92a9f1..8aeae42 100644
--- a/src/main/java/com/android/tools/r8/code/Format22b.java
+++ b/src/main/java/com/android/tools/r8/code/Format22b.java
@@ -12,14 +12,14 @@
public abstract class Format22b extends Base2Format {
- public final int AA;
- public final int BB;
- public final int CC;
+ public final short AA;
+ public final short BB;
+ public final byte CC;
// vAA | op | #+CC | VBB
/*package*/ Format22b(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
CC = readSigned8BitValue(stream);
BB = read8BitValue(stream);
}
@@ -28,9 +28,9 @@
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
assert 0 <= BB && BB <= Constants.U8BIT_MAX;
assert Byte.MIN_VALUE <= CC && CC <= Byte.MAX_VALUE;
- this.AA = AA;
- this.BB = BB;
- this.CC = CC;
+ this.AA = (short) AA;
+ this.BB = (short) BB;
+ this.CC = (byte) CC;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format22c.java b/src/main/java/com/android/tools/r8/code/Format22c.java
index f97089c..db20a3c 100644
--- a/src/main/java/com/android/tools/r8/code/Format22c.java
+++ b/src/main/java/com/android/tools/r8/code/Format22c.java
@@ -13,23 +13,23 @@
abstract class Format22c extends Base2Format {
- public final int A;
- public final int B;
+ public final byte A;
+ public final byte B;
public IndexedDexItem CCCC;
// vB | vA | op | [type|field]@CCCC
/*package*/ Format22c(int high, BytecodeStream stream, IndexedDexItem[] map) {
super(stream);
- A = high & 0xf;
- B = (high >> 4) & 0xf;
+ A = (byte) (high & 0xf);
+ B = (byte) ((high >> 4) & 0xf);
CCCC = map[read16BitValue(stream)];
}
/*package*/ Format22c(int A, int B, IndexedDexItem CCCC) {
assert 0 <= A && A <= Constants.U4BIT_MAX;
assert 0 <= B && B <= Constants.U4BIT_MAX;
- this.A = A;
- this.B = B;
+ this.A = (byte) A;
+ this.B = (byte) B;
this.CCCC = CCCC;
}
diff --git a/src/main/java/com/android/tools/r8/code/Format22s.java b/src/main/java/com/android/tools/r8/code/Format22s.java
index 6b045f2..eef5fa5 100644
--- a/src/main/java/com/android/tools/r8/code/Format22s.java
+++ b/src/main/java/com/android/tools/r8/code/Format22s.java
@@ -12,15 +12,15 @@
public abstract class Format22s extends Base2Format {
- public final int A;
- public final int B;
- public final int CCCC;
+ public final byte A;
+ public final byte B;
+ public final short CCCC;
// vB | vA | op | #+CCCC
/*package*/ Format22s(int high, BytecodeStream stream) {
super(stream);
- A = high & 0xf;
- B = (high >> 4) & 0xf;
+ A = (byte) (high & 0xf);
+ B = (byte) ((high >> 4) & 0xf);
CCCC = readSigned16BitValue(stream);
}
@@ -28,9 +28,9 @@
assert 0 <= A && A <= Constants.U4BIT_MAX;
assert 0 <= B && B <= Constants.U4BIT_MAX;
assert Short.MIN_VALUE <= CCCC && CCCC <= Short.MAX_VALUE;
- this.A = A;
- this.B = B;
- this.CCCC = CCCC;
+ this.A = (byte) A;
+ this.B = (byte) B;
+ this.CCCC = (short) CCCC;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format22t.java b/src/main/java/com/android/tools/r8/code/Format22t.java
index 04a3d2e..6cd51d3 100644
--- a/src/main/java/com/android/tools/r8/code/Format22t.java
+++ b/src/main/java/com/android/tools/r8/code/Format22t.java
@@ -13,15 +13,15 @@
abstract class Format22t extends Base2Format {
- public final int A;
- public final int B;
- public final /* offset */ int CCCC;
+ public final byte A;
+ public final byte B;
+ public final /* offset */ short CCCC;
// vB | vA | op | +CCCC
Format22t(int high, BytecodeStream stream) {
super(stream);
- A = high & 0xf;
- B = (high >> 4) & 0xf;
+ A = (byte) (high & 0xf);
+ B = (byte) ((high >> 4) & 0xf);
CCCC = readSigned16BitValue(stream);
}
@@ -29,9 +29,9 @@
assert 0 <= register1 && register1 <= Constants.U4BIT_MAX;
assert 0 <= register2 && register2 <= Constants.U4BIT_MAX;
assert Short.MIN_VALUE <= offset && offset <= Short.MAX_VALUE;
- A = register1;
- B = register2;
- CCCC = offset;
+ A = (byte) register1;
+ B = (byte) register2;
+ CCCC = (short) offset;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format22x.java b/src/main/java/com/android/tools/r8/code/Format22x.java
index 789b12c..fba570b 100644
--- a/src/main/java/com/android/tools/r8/code/Format22x.java
+++ b/src/main/java/com/android/tools/r8/code/Format22x.java
@@ -11,21 +11,21 @@
abstract class Format22x extends Base2Format {
- public final int AA;
- public final int BBBB;
+ public final short AA;
+ public final char BBBB;
// AA | op | vBBBB
Format22x(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBB = read16BitValue(stream);
}
Format22x(int dest, int src) {
assert 0 <= dest && dest <= Constants.U8BIT_MAX;
assert 0 <= src && src <= Constants.U16BIT_MAX;
- AA = dest;
- BBBB = src;
+ AA = (short) dest;
+ BBBB = (char) src;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
@@ -46,11 +46,11 @@
}
public String toString(ClassNameMapper naming) {
- return formatString("v" + AA + ", v" + BBBB);
+ return formatString("v" + AA + ", v" + (int)BBBB);
}
public String toSmaliString(ClassNameMapper naming) {
- return formatSmaliString("v" + AA + ", v" + BBBB);
+ return formatSmaliString("v" + AA + ", v" + (int)BBBB);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/code/Format23x.java b/src/main/java/com/android/tools/r8/code/Format23x.java
index fd3bdab..0800142 100644
--- a/src/main/java/com/android/tools/r8/code/Format23x.java
+++ b/src/main/java/com/android/tools/r8/code/Format23x.java
@@ -11,14 +11,14 @@
abstract class Format23x extends Base2Format {
- public final int AA;
- public final int BB;
- public final int CC;
+ public final short AA;
+ public final short BB;
+ public final short CC;
// vAA | op | vCC | vBB
Format23x(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
CC = read8BitValue(stream);
BB = read8BitValue(stream);
}
@@ -27,9 +27,9 @@
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
assert 0 <= BB && BB <= Constants.U8BIT_MAX;
assert 0 <= CC && CC <= Constants.U8BIT_MAX;
- this.AA = AA;
- this.BB = BB;
- this.CC = CC;
+ this.AA = (short) AA;
+ this.BB = (short) BB;
+ this.CC = (short) CC;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format31c.java b/src/main/java/com/android/tools/r8/code/Format31c.java
index b86d58b..d0df40e 100644
--- a/src/main/java/com/android/tools/r8/code/Format31c.java
+++ b/src/main/java/com/android/tools/r8/code/Format31c.java
@@ -15,19 +15,19 @@
abstract class Format31c extends Base3Format {
- public final int AA;
+ public final short AA;
public DexString BBBBBBBB;
// vAA | op | string@BBBBlo | string@#+BBBBhi
Format31c(int high, BytecodeStream stream, DexString[] map) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBBBBBB = map[(int) read32BitValue(stream)];
}
Format31c(int AA, DexString BBBBBBBB) {
assert 0 <= AA && AA <= U8BIT_MAX;
- this.AA = AA;
+ this.AA = (short) AA;
this.BBBBBBBB = BBBBBBBB;
}
diff --git a/src/main/java/com/android/tools/r8/code/Format31i.java b/src/main/java/com/android/tools/r8/code/Format31i.java
index 09192d6..dafe106 100644
--- a/src/main/java/com/android/tools/r8/code/Format31i.java
+++ b/src/main/java/com/android/tools/r8/code/Format31i.java
@@ -11,19 +11,19 @@
abstract class Format31i extends Base3Format {
- public final int AA;
+ public final short AA;
public final int BBBBBBBB;
// vAA | op | #+BBBBlo | #+BBBBhi
/*package*/ Format31i(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBBBBBB = readSigned32BitValue(stream);
}
/*package*/ Format31i(int AA, int BBBBBBBB) {
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
- this.AA = AA;
+ this.AA = (short) AA;
this.BBBBBBBB = BBBBBBBB;
}
diff --git a/src/main/java/com/android/tools/r8/code/Format31t.java b/src/main/java/com/android/tools/r8/code/Format31t.java
index f179017..ec41ed4 100644
--- a/src/main/java/com/android/tools/r8/code/Format31t.java
+++ b/src/main/java/com/android/tools/r8/code/Format31t.java
@@ -11,19 +11,19 @@
public abstract class Format31t extends Base3Format {
- public final int AA;
+ public final short AA;
protected /* offset */ int BBBBBBBB;
// vAA | op | +BBBBlo | +BBBBhi
Format31t(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBBBBBB = readSigned32BitValue(stream);
}
Format31t(int register, int payloadOffset) {
assert 0 <= register && register <= Constants.U8BIT_MAX;
- AA = register;
+ AA = (short) register;
BBBBBBBB = payloadOffset;
}
diff --git a/src/main/java/com/android/tools/r8/code/Format35c.java b/src/main/java/com/android/tools/r8/code/Format35c.java
index 03771e5..8ca8a39 100644
--- a/src/main/java/com/android/tools/r8/code/Format35c.java
+++ b/src/main/java/com/android/tools/r8/code/Format35c.java
@@ -13,26 +13,26 @@
public abstract class Format35c extends Base3Format {
- public final int A;
- public final int C;
- public final int D;
- public final int E;
- public final int F;
- public final int G;
+ public final byte A;
+ public final byte C;
+ public final byte D;
+ public final byte E;
+ public final byte F;
+ public final byte G;
public IndexedDexItem BBBB;
// A | G | op | BBBB | F | E | D | C
Format35c(int high, BytecodeStream stream, IndexedDexItem[] map) {
super(stream);
- G = high & 0xf;
- A = (high >> 4) & 0xf;
+ G = (byte) (high & 0xf);
+ A = (byte) ((high >> 4) & 0xf);
BBBB = map[read16BitValue(stream)];
int next = read8BitValue(stream);
- E = next & 0xf;
- F = (next >> 4) & 0xf;
+ E = (byte) (next & 0xf);
+ F = (byte) ((next >> 4) & 0xf);
next = read8BitValue(stream);
- C = next & 0xf;
- D = (next >> 4) & 0xf;
+ C = (byte) (next & 0xf);
+ D = (byte) ((next >> 4) & 0xf);
}
protected Format35c(int A, IndexedDexItem BBBB, int C, int D, int E, int F, int G) {
@@ -42,13 +42,13 @@
assert 0 <= E && E <= Constants.U4BIT_MAX;
assert 0 <= F && F <= Constants.U4BIT_MAX;
assert 0 <= G && G <= Constants.U4BIT_MAX;
- this.A = A;
+ this.A = (byte) A;
this.BBBB = BBBB;
- this.C = C;
- this.D = D;
- this.E = E;
- this.F = F;
- this.G = G;
+ this.C = (byte) C;
+ this.D = (byte) D;
+ this.E = (byte) E;
+ this.F = (byte) F;
+ this.G = (byte) G;
}
public void write(ShortBuffer dest, ObjectToOffsetMapping mapping) {
diff --git a/src/main/java/com/android/tools/r8/code/Format3rc.java b/src/main/java/com/android/tools/r8/code/Format3rc.java
index b8ee74e..8e608ba 100644
--- a/src/main/java/com/android/tools/r8/code/Format3rc.java
+++ b/src/main/java/com/android/tools/r8/code/Format3rc.java
@@ -13,14 +13,14 @@
public abstract class Format3rc extends Base3Format {
- public final int AA;
- public final int CCCC;
+ public final short AA;
+ public final char CCCC;
public IndexedDexItem BBBB;
// AA | op | [meth|type]@BBBBB | CCCC
Format3rc(int high, BytecodeStream stream, IndexedDexItem[] map) {
super(stream);
- this.AA = high;
+ this.AA = (short) high;
this.BBBB = map[read16BitValue(stream)];
this.CCCC = read16BitValue(stream);
}
@@ -28,8 +28,8 @@
Format3rc(int firstArgumentRegister, int argumentCount, IndexedDexItem dexItem) {
assert 0 <= firstArgumentRegister && firstArgumentRegister <= Constants.U16BIT_MAX;
assert 0 <= argumentCount && argumentCount <= Constants.U8BIT_MAX;
- this.CCCC = firstArgumentRegister;
- this.AA = argumentCount;
+ this.CCCC = (char) firstArgumentRegister;
+ this.AA = (short) argumentCount;
BBBB = dexItem;
}
@@ -52,10 +52,11 @@
}
private void appendRegisterRange(StringBuilder builder) {
+ int firstRegister = CCCC;
builder.append("{ ");
- builder.append("v").append(CCCC);
+ builder.append("v").append(firstRegister);
if (AA != 1) {
- builder.append(" .. v").append(CCCC + AA - 1);
+ builder.append(" .. v").append(firstRegister + AA - 1);
}
builder.append(" }");
}
diff --git a/src/main/java/com/android/tools/r8/code/Format45cc.java b/src/main/java/com/android/tools/r8/code/Format45cc.java
index bea1807..2907c82 100644
--- a/src/main/java/com/android/tools/r8/code/Format45cc.java
+++ b/src/main/java/com/android/tools/r8/code/Format45cc.java
@@ -16,26 +16,26 @@
/** Format45cc for instructions of size 4, with 5 registers and 2 constant pool index. */
public abstract class Format45cc extends Base4Format {
- public final int A;
- public final int C;
- public final int D;
- public final int E;
- public final int F;
- public final int G;
+ public final byte A;
+ public final byte C;
+ public final byte D;
+ public final byte E;
+ public final byte F;
+ public final byte G;
public DexMethod BBBB;
public DexProto HHHH;
Format45cc(int high, BytecodeStream stream, DexMethod[] methodMap, DexProto[] protoMap) {
super(stream);
- G = high & 0xf;
- A = (high >> 4) & 0xf;
+ G = (byte) (high & 0xf);
+ A = (byte) ((high >> 4) & 0xf);
BBBB = methodMap[read16BitValue(stream)];
int next = read8BitValue(stream);
- E = next & 0xf;
- F = (next >> 4) & 0xf;
+ E = (byte) (next & 0xf);
+ F = (byte) ((next >> 4) & 0xf);
next = read8BitValue(stream);
- C = next & 0xf;
- D = (next >> 4) & 0xf;
+ C = (byte) (next & 0xf);
+ D = (byte) ((next >> 4) & 0xf);
HHHH = protoMap[read16BitValue(stream)];
}
@@ -47,14 +47,14 @@
assert 0 <= E && E <= U4BIT_MAX;
assert 0 <= F && F <= U4BIT_MAX;
assert 0 <= G && G <= U4BIT_MAX;
- this.A = A;
+ this.A = (byte) A;
this.BBBB = BBBB;
this.HHHH = HHHH;
- this.C = C;
- this.D = D;
- this.E = E;
- this.F = F;
- this.G = G;
+ this.C = (byte) C;
+ this.D = (byte) D;
+ this.E = (byte) E;
+ this.F = (byte) F;
+ this.G = (byte) G;
}
public final int hashCode() {
diff --git a/src/main/java/com/android/tools/r8/code/Format4rcc.java b/src/main/java/com/android/tools/r8/code/Format4rcc.java
index ceac4c8..5020e8e 100644
--- a/src/main/java/com/android/tools/r8/code/Format4rcc.java
+++ b/src/main/java/com/android/tools/r8/code/Format4rcc.java
@@ -16,15 +16,15 @@
/** Format4rcc for instructions of size 4, with a range of registers and 2 constant pool index. */
public abstract class Format4rcc extends Base4Format {
- public final int AA;
- public final int CCCC;
+ public final short AA;
+ public final char CCCC;
public DexMethod BBBB;
public DexProto HHHH;
// AA | op | [meth]@BBBB | CCCC | [proto]@HHHH
Format4rcc(int high, BytecodeStream stream, DexMethod[] methodMap, DexProto[] protoMap) {
super(stream);
- this.AA = high;
+ this.AA = (short) high;
this.BBBB = methodMap[read16BitValue(stream)];
this.CCCC = read16BitValue(stream);
this.HHHH = protoMap[read16BitValue(stream)];
@@ -33,8 +33,8 @@
Format4rcc(int firstArgumentRegister, int argumentCount, DexMethod method, DexProto proto) {
assert 0 <= firstArgumentRegister && firstArgumentRegister <= Constants.U16BIT_MAX;
assert 0 <= argumentCount && argumentCount <= Constants.U8BIT_MAX;
- this.CCCC = firstArgumentRegister;
- this.AA = argumentCount;
+ this.CCCC = (char) firstArgumentRegister;
+ this.AA = (short) argumentCount;
BBBB = method;
HHHH = proto;
}
@@ -106,10 +106,11 @@
}
private void appendRegisterRange(StringBuilder builder) {
+ int firstRegister = CCCC;
builder.append("{ ");
- builder.append("v").append(CCCC);
+ builder.append("v").append(firstRegister);
if (AA != 1) {
- builder.append(" .. v").append(CCCC + AA - 1);
+ builder.append(" .. v").append(firstRegister + AA - 1);
}
builder.append(" }");
}
diff --git a/src/main/java/com/android/tools/r8/code/Format51l.java b/src/main/java/com/android/tools/r8/code/Format51l.java
index d135ffe..10c7a3e 100644
--- a/src/main/java/com/android/tools/r8/code/Format51l.java
+++ b/src/main/java/com/android/tools/r8/code/Format51l.java
@@ -11,19 +11,19 @@
abstract class Format51l extends Base5Format {
- public final int AA;
+ public final short AA;
public final long BBBBBBBBBBBBBBBB;
// AA | op | BBBB | BBBB | BBBB | BBBB
Format51l(int high, BytecodeStream stream) {
super(stream);
- AA = high;
+ AA = (short) high;
BBBBBBBBBBBBBBBB = read64BitValue(stream);
}
public Format51l(int AA, long BBBBBBBBBBBBBBBB) {
assert 0 <= AA && AA <= Constants.U8BIT_MAX;
- this.AA = AA;
+ this.AA = (short) AA;
this.BBBBBBBBBBBBBBBB = BBBBBBBBBBBBBBBB;
}
diff --git a/src/main/java/com/android/tools/r8/code/Instruction.java b/src/main/java/com/android/tools/r8/code/Instruction.java
index 316a759..6b61845 100644
--- a/src/main/java/com/android/tools/r8/code/Instruction.java
+++ b/src/main/java/com/android/tools/r8/code/Instruction.java
@@ -34,22 +34,21 @@
this.offset = -1;
}
- static int readSigned8BitValue(BytecodeStream stream) {
+ static byte readSigned8BitValue(BytecodeStream stream) {
return (byte) stream.nextByte();
}
- static int read8BitValue(BytecodeStream stream) {
- int result = stream.nextByte();
- return result;
+ static short read8BitValue(BytecodeStream stream) {
+ return (short) stream.nextByte();
}
- static int readSigned16BitValue(BytecodeStream stream) {
+ static short readSigned16BitValue(BytecodeStream stream) {
// Convert to signed.
return (short) stream.nextShort();
}
- static int read16BitValue(BytecodeStream stream) {
- return stream.nextShort() & 0xffff;
+ static char read16BitValue(BytecodeStream stream) {
+ return (char) (stream.nextShort() & 0xffff);
}
static int readSigned32BitValue(BytecodeStream stream) {
diff --git a/src/main/java/com/android/tools/r8/compatdx/CompatDx.java b/src/main/java/com/android/tools/r8/compatdx/CompatDx.java
index 6bbb406..6750f4c 100644
--- a/src/main/java/com/android/tools/r8/compatdx/CompatDx.java
+++ b/src/main/java/com/android/tools/r8/compatdx/CompatDx.java
@@ -450,13 +450,15 @@
ExecutorService executor = ThreadUtils.getExecutorService(numberOfThreads);
D8Output result;
try {
- result = D8.run(
- D8Command.builder()
- .addProgramFiles(inputs)
- .setMode(mode)
- .setMinApiLevel(dexArgs.minApiLevel)
- .setMainDexListFile(mainDexList)
- .build());
+ D8Command.Builder builder = D8Command.builder();
+ builder
+ .addProgramFiles(inputs)
+ .setMode(mode)
+ .setMinApiLevel(dexArgs.minApiLevel);
+ if (mainDexList != null) {
+ builder.addMainDexListFiles(mainDexList);
+ }
+ result = D8.run(builder.build());
} finally {
executor.shutdown();
}
diff --git a/src/main/java/com/android/tools/r8/dex/ApplicationReader.java b/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
index 355080f..8820b4d 100644
--- a/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
+++ b/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
@@ -29,6 +29,7 @@
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.ClassProvider;
import com.android.tools.r8.utils.ClasspathClassCollection;
+import com.android.tools.r8.utils.DescriptorUtils;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.LibraryClassCollection;
import com.android.tools.r8.utils.MainDexList;
@@ -45,6 +46,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.stream.Collectors;
public class ApplicationReader {
@@ -149,13 +151,20 @@
if (inputApp.hasMainDexList()) {
futures.add(executorService.submit(() -> {
try {
- InputStream input = inputApp.getMainDexList(closer);
- builder.addToMainDexList(MainDexList.parse(input, itemFactory));
+ for (Resource resource : inputApp.getMainDexListResources()) {
+ InputStream input = closer.register(resource.getStream());
+ builder.addToMainDexList(MainDexList.parse(input, itemFactory));
+ }
} catch (IOException e) {
throw new RuntimeException(e);
}
}));
}
+ builder.addToMainDexList(
+ inputApp.getMainDexClasses()
+ .stream()
+ .map(clazz -> itemFactory.createType(DescriptorUtils.javaTypeToDescriptor(clazz)))
+ .collect(Collectors.toList()));
}
private final class ClassReader {
diff --git a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
index 6586a57..1cb0fb0 100644
--- a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
@@ -3,9 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.dex;
-import com.android.tools.r8.dex.VirtualFile.FilePerClassDistributor;
-import com.android.tools.r8.dex.VirtualFile.FillFilesDistributor;
-import com.android.tools.r8.dex.VirtualFile.PackageMapDistributor;
import com.android.tools.r8.errors.CompilationError;
import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.DexAnnotation;
@@ -134,7 +131,7 @@
if (options.outputMode == OutputMode.FilePerClass) {
assert packageDistribution == null :
"Cannot combine package distribution definition with file-per-class option.";
- distributor = new FilePerClassDistributor(this);
+ distributor = new VirtualFile.FilePerClassDistributor(this);
} else if (!options.canUseMultidex()
&& options.mainDexKeepRules.isEmpty()
&& application.mainDexList.isEmpty()) {
@@ -148,9 +145,10 @@
} else if (packageDistribution != null) {
assert !options.minimalMainDex :
"Cannot combine package distribution definition with minimal-main-dex option.";
- distributor = new PackageMapDistributor(this, packageDistribution, executorService);
+ distributor =
+ new VirtualFile.PackageMapDistributor(this, packageDistribution, executorService);
} else {
- distributor = new FillFilesDistributor(this, options.minimalMainDex);
+ distributor = new VirtualFile.FillFilesDistributor(this, options.minimalMainDex);
}
Map<Integer, VirtualFile> newFiles = distributor.run();
@@ -188,7 +186,7 @@
}
byte[] mainDexList = writeMainDexList();
if (mainDexList != null) {
- builder.setMainDexListData(mainDexList);
+ builder.setMainDexListOutputData(mainDexList);
}
return builder.build();
} finally {
diff --git a/src/main/java/com/android/tools/r8/dex/FileWriter.java b/src/main/java/com/android/tools/r8/dex/FileWriter.java
index 332f292..bdcbafe 100644
--- a/src/main/java/com/android/tools/r8/dex/FileWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/FileWriter.java
@@ -5,8 +5,6 @@
import static com.android.tools.r8.utils.LebUtils.sizeAsUleb128;
-import com.google.common.collect.Sets;
-
import com.android.tools.r8.code.Instruction;
import com.android.tools.r8.errors.CompilationError;
import com.android.tools.r8.graph.AppInfo;
@@ -51,12 +49,11 @@
import com.android.tools.r8.naming.NamingLens;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.LebUtils;
-
+import com.google.common.collect.Sets;
import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap;
import it.unimi.dsi.fastutil.objects.Reference2IntMap;
-
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Arrays;
@@ -297,7 +294,7 @@
}
} else {
- if (method.accessFlags.isConstructor()) {
+ if (method.isInstanceInitializer()) {
throw new CompilationError(
"Interface must not have constructors: " + method.method.toSourceString());
}
diff --git a/src/main/java/com/android/tools/r8/dex/VirtualFile.java b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
index f309670..3432b62 100644
--- a/src/main/java/com/android/tools/r8/dex/VirtualFile.java
+++ b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
@@ -5,6 +5,7 @@
import com.android.tools.r8.errors.CompilationError;
import com.android.tools.r8.errors.InternalCompilerError;
+import com.android.tools.r8.errors.MainDexError;
import com.android.tools.r8.graph.DexApplication;
import com.android.tools.r8.graph.DexCallSite;
import com.android.tools.r8.graph.DexClass;
@@ -174,33 +175,15 @@
return isFull(transaction.getNumberOfMethods(), transaction.getNumberOfFields(), MAX_ENTRIES);
}
- void throwIfFull(boolean multiDexEnabled) {
+ void throwIfFull(boolean hasMainDexList) {
if (!isFull()) {
return;
}
- StringBuilder messageBuilder = new StringBuilder();
- // General message: Cannot fit.
- messageBuilder.append("Cannot fit requested classes in ");
- messageBuilder.append(multiDexEnabled ? "the main-" : "a single ");
- messageBuilder.append("dex file.\n");
- // Suggest supplying the main-dex list or explicitly mention that main-dex list is too large.
- if (multiDexEnabled) {
- messageBuilder.append("The list of classes for the main-dex list is too large.\n");
- } else {
- messageBuilder.append("Try supplying a main-dex list.\n");
- }
- // Show the numbers of methods and/or fields that exceed the limit.
- if (transaction.getNumberOfMethods() > MAX_ENTRIES) {
- messageBuilder.append("# methods: ");
- messageBuilder.append(transaction.getNumberOfMethods());
- messageBuilder.append(" > ").append(MAX_ENTRIES).append('\n');
- }
- if (transaction.getNumberOfFields() > MAX_ENTRIES) {
- messageBuilder.append("# fields: ");
- messageBuilder.append(transaction.getNumberOfFields());
- messageBuilder.append(" > ").append(MAX_ENTRIES).append('\n');
- }
- throw new CompilationError(messageBuilder.toString());
+ throw new MainDexError(
+ hasMainDexList,
+ transaction.getNumberOfMethods(),
+ transaction.getNumberOfFields(),
+ MAX_ENTRIES);
}
private boolean isFilledEnough(FillStrategy fillStrategy) {
@@ -276,7 +259,6 @@
if (clazz != null && clazz.isProgramClass()) {
DexProgramClass programClass = (DexProgramClass) clazz;
mainDexFile.addClass(programClass);
- mainDexFile.throwIfFull(true);
classes.remove(programClass);
} else {
System.out.println(
@@ -286,6 +268,7 @@
}
mainDexFile.commitTransaction();
}
+ mainDexFile.throwIfFull(true);
}
}
@@ -364,9 +347,9 @@
for (DexProgramClass programClass : classes) {
mainDexFile.addClass(programClass);
- mainDexFile.throwIfFull(false);
}
mainDexFile.commitTransaction();
+ mainDexFile.throwIfFull(false);
return nameToFileMap;
}
}
diff --git a/src/main/java/com/android/tools/r8/errors/MainDexError.java b/src/main/java/com/android/tools/r8/errors/MainDexError.java
new file mode 100644
index 0000000..4c23aca
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/errors/MainDexError.java
@@ -0,0 +1,89 @@
+// Copyright (c) 2017, 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.errors;
+
+/**
+ * Exception regarding main-dex list and main dex rules.
+ *
+ * Depending on tool kind, this exception should be massaged, e.g., adding appropriate suggestions,
+ * and re-thrown as {@link CompilationError}, which will be in turn informed to the user as an
+ * expected compilation error.
+ */
+public class MainDexError extends RuntimeException {
+
+ private final boolean hasMainDexList;
+ private final long numOfMethods;
+ private final long numOfFields;
+ private final long maxNumOfEntries;
+
+ public MainDexError(
+ boolean hasMainDexList, long numOfMethods, long numOfFields, long maxNumOfEntries) {
+ this.hasMainDexList = hasMainDexList;
+ this.numOfMethods = numOfMethods;
+ this.numOfFields = numOfFields;
+ this.maxNumOfEntries = maxNumOfEntries;
+ }
+
+ private String getGeneralMessage() {
+ StringBuilder messageBuilder = new StringBuilder();
+ // General message: Cannot fit.
+ messageBuilder.append("Cannot fit requested classes in ");
+ messageBuilder.append(hasMainDexList ? "the main-" : "a single ");
+ messageBuilder.append("dex file.\n");
+
+ return messageBuilder.toString();
+ }
+
+ private String getNumberRelatedMessage() {
+ StringBuilder messageBuilder = new StringBuilder();
+ // Show the numbers of methods and/or fields that exceed the limit.
+ if (numOfMethods > maxNumOfEntries) {
+ messageBuilder.append("# methods: ");
+ messageBuilder.append(numOfMethods);
+ messageBuilder.append(" > ").append(maxNumOfEntries).append('\n');
+ }
+ if (numOfFields > maxNumOfEntries) {
+ messageBuilder.append("# fields: ");
+ messageBuilder.append(numOfFields);
+ messageBuilder.append(" > ").append(maxNumOfEntries).append('\n');
+ }
+
+ return messageBuilder.toString();
+ }
+
+ @Override
+ public String getMessage() {
+ // Placeholder to generate a general error message for other (minor) utilities:
+ // Bisect, disassembler, dexsegments.
+ // Implement tool-specific error message generator, like D8 and R8 below, if necessary.
+ return getGeneralMessage() + getNumberRelatedMessage();
+ }
+
+ public String getMessageForD8() {
+ StringBuilder messageBuilder = new StringBuilder();
+ messageBuilder.append(getGeneralMessage());
+ if (hasMainDexList) {
+ messageBuilder.append("Classes required by the main-dex list ");
+ messageBuilder.append("do not fit in one dex.\n");
+ } else {
+ messageBuilder.append("Try supplying a main-dex list.\n");
+ }
+ messageBuilder.append(getNumberRelatedMessage());
+ return messageBuilder.toString();
+ }
+
+ public String getMessageForR8() {
+ StringBuilder messageBuilder = new StringBuilder();
+ messageBuilder.append(getGeneralMessage());
+ if (hasMainDexList) {
+ messageBuilder.append("Classes required by main dex rules and the main-dex list ");
+ messageBuilder.append("do not fit in one dex.\n");
+ } else {
+ messageBuilder.append("Try supplying a main-dex list or main dex rules.\n");
+ }
+ messageBuilder.append(getNumberRelatedMessage());
+ return messageBuilder.toString();
+ }
+
+}
diff --git a/src/main/java/com/android/tools/r8/graph/AppInfo.java b/src/main/java/com/android/tools/r8/graph/AppInfo.java
index 3601ee9..afd923c 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfo.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfo.java
@@ -331,6 +331,10 @@
return null;
}
+ public void registerNewType(DexType newType, DexType superType) {
+ // We do not track subtyping relationships in the basic AppInfo. So do nothing.
+ }
+
public List<DexClass> getSuperTypeClasses(DexType type) {
List<DexClass> result = new ArrayList<>();
do {
diff --git a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
index 503bc89..9c87b61 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
@@ -227,6 +227,12 @@
}
@Override
+ public void registerNewType(DexType newType, DexType superType) {
+ // Register the relationship between this type and its superType.
+ superType.addDirectSubtype(newType);
+ }
+
+ @Override
public boolean hasSubtyping() {
return true;
}
diff --git a/src/main/java/com/android/tools/r8/graph/Code.java b/src/main/java/com/android/tools/r8/graph/Code.java
index 84d6d5d..54f9470 100644
--- a/src/main/java/com/android/tools/r8/graph/Code.java
+++ b/src/main/java/com/android/tools/r8/graph/Code.java
@@ -33,6 +33,10 @@
return false;
}
+ public int estimatedSizeForInlining() {
+ return Integer.MAX_VALUE;
+ }
+
public DexCode asDexCode() {
throw new Unreachable(getClass().getCanonicalName() + ".asDexCode()");
}
diff --git a/src/main/java/com/android/tools/r8/graph/DelegatingUseRegistry.java b/src/main/java/com/android/tools/r8/graph/DelegatingUseRegistry.java
new file mode 100644
index 0000000..0e28d3d
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/graph/DelegatingUseRegistry.java
@@ -0,0 +1,68 @@
+// Copyright (c) 2017, 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.graph;
+
+public class DelegatingUseRegistry extends UseRegistry {
+ private final UseRegistry delegate;
+
+ public DelegatingUseRegistry(UseRegistry delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public boolean registerInvokeVirtual(DexMethod method) {
+ return delegate.registerInvokeVirtual(method);
+ }
+
+ @Override
+ public boolean registerInvokeDirect(DexMethod method) {
+ return delegate.registerInvokeDirect(method);
+ }
+
+ @Override
+ public boolean registerInvokeStatic(DexMethod method) {
+ return delegate.registerInvokeStatic(method);
+ }
+
+ @Override
+ public boolean registerInvokeInterface(DexMethod method) {
+ return delegate.registerInvokeInterface(method);
+ }
+
+ @Override
+ public boolean registerInvokeSuper(DexMethod method) {
+ return delegate.registerInvokeSuper(method);
+ }
+
+ @Override
+ public boolean registerInstanceFieldWrite(DexField field) {
+ return delegate.registerInstanceFieldWrite(field);
+ }
+
+ @Override
+ public boolean registerInstanceFieldRead(DexField field) {
+ return delegate.registerInstanceFieldRead(field);
+ }
+
+ @Override
+ public boolean registerNewInstance(DexType type) {
+ return delegate.registerNewInstance(type);
+ }
+
+ @Override
+ public boolean registerStaticFieldRead(DexField field) {
+ return delegate.registerStaticFieldRead(field);
+ }
+
+ @Override
+ public boolean registerStaticFieldWrite(DexField field) {
+ return delegate.registerStaticFieldWrite(field);
+ }
+
+ @Override
+ public boolean registerTypeReference(DexType type) {
+ return delegate.registerTypeReference(type);
+ }
+
+}
diff --git a/src/main/java/com/android/tools/r8/graph/DexClass.java b/src/main/java/com/android/tools/r8/graph/DexClass.java
index aedb6df..d09d395 100644
--- a/src/main/java/com/android/tools/r8/graph/DexClass.java
+++ b/src/main/java/com/android/tools/r8/graph/DexClass.java
@@ -7,9 +7,7 @@
import com.android.tools.r8.dex.MixedSectionCollection;
import com.android.tools.r8.errors.CompilationError;
import com.android.tools.r8.errors.Unreachable;
-
import com.google.common.base.MoreObjects;
-
import java.util.Arrays;
import java.util.function.Consumer;
@@ -177,12 +175,8 @@
}
public DexEncodedMethod getClassInitializer() {
- for (DexEncodedMethod method : directMethods()) {
- if (method.accessFlags.isConstructor() && method.accessFlags.isStatic()) {
- return method;
- }
- }
- return null;
+ return Arrays.stream(directMethods()).filter(DexEncodedMethod::isClassInitializer).findAny()
+ .orElse(null);
}
public Resource.Kind getOrigin() {
@@ -204,4 +198,9 @@
// For non-dex code we don't try to check the code.
return true;
}
+
+ public boolean defaultValuesForStaticFieldsMayTriggerAllocation() {
+ return Arrays.stream(staticFields())
+ .anyMatch(field -> !field.staticValue.mayTriggerAllocation());
+ }
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexCode.java b/src/main/java/com/android/tools/r8/graph/DexCode.java
index d939868..a2edd92 100644
--- a/src/main/java/com/android/tools/r8/graph/DexCode.java
+++ b/src/main/java/com/android/tools/r8/graph/DexCode.java
@@ -64,6 +64,11 @@
}
@Override
+ public int estimatedSizeForInlining() {
+ return instructions.length;
+ }
+
+ @Override
public DexCode asDexCode() {
return this;
}
@@ -170,6 +175,9 @@
public String toString(DexEncodedMethod method, ClassNameMapper naming) {
StringBuilder builder = new StringBuilder();
+ if (method != null) {
+ builder.append(method.toSourceString()).append("\n");
+ }
builder.append("registers: ").append(registerSize);
builder.append(", inputs: ").append(incomingRegisterSize);
builder.append(", outputs: ").append(outgoingRegisterSize).append("\n");
diff --git a/src/main/java/com/android/tools/r8/graph/DexDebugEntryBuilder.java b/src/main/java/com/android/tools/r8/graph/DexDebugEntryBuilder.java
index 39ec7d0..7bfa534 100644
--- a/src/main/java/com/android/tools/r8/graph/DexDebugEntryBuilder.java
+++ b/src/main/java/com/android/tools/r8/graph/DexDebugEntryBuilder.java
@@ -5,6 +5,8 @@
import com.android.tools.r8.ir.code.MoveType;
import com.google.common.collect.ImmutableMap;
+import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2ReferenceMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -44,6 +46,7 @@
private boolean prologueEnd = false;
private boolean epilogueBegin = false;
private final Map<Integer, LocalEntry> locals = new HashMap<>();
+ private final Int2ReferenceMap<DebugLocalInfo> arguments = new Int2ReferenceArrayMap<>();
// Delayed construction of an entry. Is finalized once locals information has been collected.
private DexDebugEntry pending = null;
@@ -65,7 +68,7 @@
if (!method.accessFlags.isStatic()) {
DexString name = factory.thisName;
DexType type = method.method.getHolder();
- startLocal(argumentRegister, name, type, null);
+ startArgument(argumentRegister, name, type);
argumentRegister += MoveType.fromDexType(type).requiredRegisters();
}
DexType[] types = method.method.proto.parameters.values;
@@ -73,9 +76,9 @@
for (int i = 0; i < types.length; i++) {
// If null, the parameter has a parameterized type and the local is introduced in the stream.
if (names[i] != null) {
- startLocal(argumentRegister, names[i], types[i], null);
- argumentRegister += MoveType.fromDexType(types[i]).requiredRegisters();
+ startArgument(argumentRegister, names[i], types[i]);
}
+ argumentRegister += MoveType.fromDexType(types[i]).requiredRegisters();
}
currentLine = info.startLine;
for (DexDebugEvent event : info.events) {
@@ -83,6 +86,10 @@
}
}
+ public Int2ReferenceMap<DebugLocalInfo> getArguments() {
+ return arguments;
+ }
+
public void setFile(DexString file) {
currentFile = file;
}
@@ -104,6 +111,12 @@
epilogueBegin = true;
}
+ public void startArgument(int register, DexString name, DexType type) {
+ DebugLocalInfo argument = canonicalize(name, type, null);
+ arguments.put(register, argument);
+ getEntry(register).set(argument);
+ }
+
public void startLocal(int register, DexString name, DexType type, DexString signature) {
getEntry(register).set(canonicalize(name, type, signature));
}
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 400b42f..700e45a 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -3,9 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.graph;
-import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_INLINING_CANDIDATE_PACKAGE_PRIVATE;
-import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_INLINING_CANDIDATE_PRIVATE;
-import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_INLINING_CANDIDATE_PUBLIC;
+import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_INLINING_CANDIDATE_ANY;
+import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_INLINING_CANDIDATE_SAME_CLASS;
+import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE;
+import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_INLINING_CANDIDATE_SUBCLASS;
import static com.android.tools.r8.graph.DexEncodedMethod.CompilationState.PROCESSED_NOT_INLINING_CANDIDATE;
import com.android.tools.r8.code.Const;
@@ -35,17 +36,40 @@
public class DexEncodedMethod extends KeyedDexItem<DexMethod> {
- public enum CompilationState
-
- {
+ /**
+ * Encodes the processing state of a method.
+ * <p>
+ * We also use this enum to encode whether and if under what constraints a method may be
+ * inlined.
+ */
+ public enum CompilationState {
+ /**
+ * Has not been processed, yet.
+ */
NOT_PROCESSED,
+ /**
+ * Has been processed but cannot be inlined due to instructions that are not supported.
+ */
PROCESSED_NOT_INLINING_CANDIDATE,
- // Code only contains instructions that access public entities.
- PROCESSED_INLINING_CANDIDATE_PUBLIC,
- // Code only contains instructions that access public and package private entities.
- PROCESSED_INLINING_CANDIDATE_PACKAGE_PRIVATE,
- // Code also contains instructions that access public entities.
- PROCESSED_INLINING_CANDIDATE_PRIVATE,
+ /**
+ * Code only contains instructions that access public entities and can this be inlined
+ * into any context.
+ */
+ PROCESSED_INLINING_CANDIDATE_ANY,
+ /**
+ * Code also contains instructions that access protected entities that reside in a differnt
+ * package and hence require subclass relationship to be visible.
+ */
+ PROCESSED_INLINING_CANDIDATE_SUBCLASS,
+ /**
+ * Code contains instructions that reference package private entities or protected entities
+ * from the same package.
+ */
+ PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE,
+ /**
+ * Code contains instructions that reference private entities.
+ */
+ PROCESSED_INLINING_CANDIDATE_SAME_CLASS,
}
public static final DexEncodedMethod[] EMPTY_ARRAY = new DexEncodedMethod[]{};
@@ -74,51 +98,51 @@
return compilationState != CompilationState.NOT_PROCESSED;
}
- public boolean cannotInline() {
- return compilationState == CompilationState.NOT_PROCESSED
- || compilationState == CompilationState.PROCESSED_NOT_INLINING_CANDIDATE;
+ public boolean isInstanceInitializer() {
+ return accessFlags.isConstructor() && !accessFlags.isStatic();
}
- public boolean isInliningCandidate(DexEncodedMethod container, boolean alwaysInline) {
- if (container.accessFlags.isStatic() && container.accessFlags.isConstructor()) {
+ public boolean isClassInitializer() {
+ return accessFlags.isConstructor() && accessFlags.isStatic();
+ }
+
+ public boolean isInliningCandidate(DexEncodedMethod container, boolean alwaysInline,
+ AppInfoWithSubtyping appInfo) {
+ if (isClassInitializer()) {
// This will probably never happen but never inline a class initializer.
return false;
}
if (alwaysInline) {
- // Only inline constructor iff holder classes are equal.
- if (!accessFlags.isStatic() && accessFlags.isConstructor()) {
- return container.method.getHolder() == method.getHolder();
- }
return true;
}
switch (compilationState) {
- case PROCESSED_INLINING_CANDIDATE_PUBLIC:
+ case PROCESSED_INLINING_CANDIDATE_ANY:
return true;
- case PROCESSED_INLINING_CANDIDATE_PACKAGE_PRIVATE:
+ case PROCESSED_INLINING_CANDIDATE_SUBCLASS:
+ return container.method.getHolder().isSubtypeOf(method.getHolder(), appInfo);
+ case PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE:
return container.method.getHolder().isSamePackage(method.getHolder());
- // TODO(bak): Expand check for package private access:
- case PROCESSED_INLINING_CANDIDATE_PRIVATE:
+ case PROCESSED_INLINING_CANDIDATE_SAME_CLASS:
return container.method.getHolder() == method.getHolder();
default:
return false;
}
}
- public boolean isPublicInlining() {
- return compilationState == PROCESSED_INLINING_CANDIDATE_PUBLIC;
- }
-
public boolean markProcessed(Constraint state) {
CompilationState prevCompilationState = compilationState;
switch (state) {
case ALWAYS:
- compilationState = PROCESSED_INLINING_CANDIDATE_PUBLIC;
+ compilationState = PROCESSED_INLINING_CANDIDATE_ANY;
+ break;
+ case SUBCLASS:
+ compilationState = PROCESSED_INLINING_CANDIDATE_SUBCLASS;
break;
case PACKAGE:
- compilationState = PROCESSED_INLINING_CANDIDATE_PACKAGE_PRIVATE;
+ compilationState = PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE;
break;
- case PRIVATE:
- compilationState = PROCESSED_INLINING_CANDIDATE_PRIVATE;
+ case SAMECLASS:
+ compilationState = PROCESSED_INLINING_CANDIDATE_SAME_CLASS;
break;
case NEVER:
compilationState = PROCESSED_NOT_INLINING_CANDIDATE;
@@ -282,10 +306,10 @@
itemFactory.stringType),
itemFactory.constructorMethodName);
DexCode code;
- if (accessFlags.isConstructor() && !accessFlags.isStatic()) {
+ if (isInstanceInitializer()) {
// The Java VM Spec requires that a constructor calls an initializer from the super class
// or another constructor from the current class. For simplicity we do the latter by just
- // calling outself. This is ok, as the constructor always throws before the recursive call.
+ // calling ourself. This is ok, as the constructor always throws before the recursive call.
code = generateCodeFromTemplate(3, 2, new ConstStringJumbo(0, tag),
new ConstStringJumbo(1, message),
new InvokeStatic(2, logMethod, 0, 1, 0, 0, 0),
@@ -330,6 +354,11 @@
public DexEncodedMethod toForwardingMethod(DexClass holder, DexItemFactory itemFactory) {
assert accessFlags.isPublic();
+ // Clear the final flag, as this method is now overwritten. Do this before creating the builder
+ // for the forwarding method, as the forwarding method will copy the access flags from this,
+ // and if different forwarding methods are created in different subclasses the first could be
+ // final.
+ accessFlags.unsetFinal();
DexMethod newMethod = itemFactory.createMethod(holder.type, method.proto, method.name);
Invoke.Type type = accessFlags.isStatic() ? Invoke.Type.STATIC : Invoke.Type.SUPER;
Builder builder = builder(this);
@@ -356,7 +385,6 @@
}));
}
builder.accessFlags.setSynthetic();
- accessFlags.unsetFinal();
return builder.build();
}
@@ -382,6 +410,10 @@
}
}
+ public static int slowCompare(DexEncodedMethod m1, DexEncodedMethod m2) {
+ return m1.method.slowCompareTo(m2.method);
+ }
+
public static class OptimizationInfo {
private int returnedArgument = -1;
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 6500e8f..3feae5f 100644
--- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
+++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -27,7 +27,7 @@
public class DexItemFactory {
- private final Map<String, DexString> strings = new HashMap<>();
+ private final Map<DexString, DexString> strings = new HashMap<>();
private final Map<DexType, DexType> types = new HashMap<>();
private final Map<DexField, DexField> fields = new HashMap<>();
private final Map<DexProto, DexProto> protos = new HashMap<>();
@@ -277,19 +277,14 @@
return previous == null ? item : previous;
}
- synchronized private DexString canonicalizeString(String key) {
- assert key != null;
- return strings.computeIfAbsent(key, DexString::new);
- }
-
public DexString createString(int size, byte[] content) {
assert !sorted;
- return canonicalizeString(new DexString(size, content).toString());
+ return canonicalize(strings, new DexString(size, content));
}
public DexString createString(String source) {
assert !sorted;
- return canonicalizeString(source);
+ return canonicalize(strings, new DexString(source));
}
public DexType createType(DexString descriptor) {
diff --git a/src/main/java/com/android/tools/r8/graph/DexProgramClass.java b/src/main/java/com/android/tools/r8/graph/DexProgramClass.java
index d3a5676..60a7319 100644
--- a/src/main/java/com/android/tools/r8/graph/DexProgramClass.java
+++ b/src/main/java/com/android/tools/r8/graph/DexProgramClass.java
@@ -148,7 +148,6 @@
public void addStaticMethod(DexEncodedMethod staticMethod) {
assert staticMethod.accessFlags.isStatic();
assert !staticMethod.accessFlags.isPrivate();
- assert !staticMethod.accessFlags.isConstructor();
directMethods = Arrays.copyOf(directMethods, directMethods.length + 1);
directMethods[directMethods.length - 1] = staticMethod;
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexString.java b/src/main/java/com/android/tools/r8/graph/DexString.java
index 25416d9..e6914ec 100644
--- a/src/main/java/com/android/tools/r8/graph/DexString.java
+++ b/src/main/java/com/android/tools/r8/graph/DexString.java
@@ -321,4 +321,28 @@
builder.append("]");
return builder.toString();
}
+
+ public boolean beginsWith(DexString prefix) {
+ if (content.length < prefix.content.length) {
+ return false;
+ }
+ for (int i = 0; i < prefix.content.length - 1; i++) {
+ if (content[i] != prefix.content[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public boolean endsWith(DexString suffix) {
+ if (content.length < suffix.content.length) {
+ return false;
+ }
+ for (int i = content.length - suffix.content.length, j = 0; i < content.length; i++, j++) {
+ if (content[i] != suffix.content[j]) {
+ return false;
+ }
+ }
+ return true;
+ }
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexType.java b/src/main/java/com/android/tools/r8/graph/DexType.java
index ac7d9ee..a371684 100644
--- a/src/main/java/com/android/tools/r8/graph/DexType.java
+++ b/src/main/java/com/android/tools/r8/graph/DexType.java
@@ -139,6 +139,11 @@
private boolean isSubtypeOfClass(DexType other, AppInfo appInfo) {
DexType self = this;
+ if (other.hierarchyLevel == UNKNOWN_LEVEL) {
+ // We have no definition for this class, hence it is not part of the
+ // hierarchy.
+ return false;
+ }
while (other.hierarchyLevel < self.hierarchyLevel) {
DexClass holder = appInfo.definitionFor(self);
assert holder != null && !holder.isInterface();
@@ -448,4 +453,9 @@
}
return getPackageOrName(false);
}
+
+ public boolean isImmediateSubtypeOf(DexType type) {
+ assert hierarchyLevel != UNKNOWN_LEVEL;
+ return type.directSubtypes.contains(this);
+ }
}
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 29f59e5..08c8a1c 100644
--- a/src/main/java/com/android/tools/r8/graph/DexValue.java
+++ b/src/main/java/com/android/tools/r8/graph/DexValue.java
@@ -99,6 +99,15 @@
return this == defaultForType(type, factory);
}
+ /**
+ * Whether creating this value as a default value for a field might trigger an allocation.
+ * <p>
+ * This is conservative.
+ */
+ public boolean mayTriggerAllocation() {
+ return true;
+ }
+
static private abstract class SimpleDexValue extends DexValue {
@Override
@@ -111,6 +120,11 @@
// Intentionally empty
}
+ @Override
+ public boolean mayTriggerAllocation() {
+ return false;
+ }
+
protected static void writeIntegerTo(byte type, long value, int expected,
DexOutputBuffer dest) {
// Leave space for header.
diff --git a/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java b/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java
index b28ffb5..e03b392 100644
--- a/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java
+++ b/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java
@@ -7,6 +7,7 @@
import com.android.tools.r8.graph.DexMethodHandle.MethodHandleType;
import com.android.tools.r8.utils.InternalOptions;
import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
import org.objectweb.asm.Type;
/**
@@ -19,6 +20,8 @@
public class JarApplicationReader {
public final InternalOptions options;
+ ConcurrentHashMap<String, DexString> stringCache = new ConcurrentHashMap<>();
+
public JarApplicationReader(InternalOptions options) {
this.options = options;
}
@@ -28,7 +31,7 @@
}
public DexString getString(String string) {
- return options.itemFactory.createString(string);
+ return stringCache.computeIfAbsent(string, options.itemFactory::createString);
}
public DexType getType(Type type) {
diff --git a/src/main/java/com/android/tools/r8/ir/code/Argument.java b/src/main/java/com/android/tools/r8/ir/code/Argument.java
index d624990..c7b55d5 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Argument.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Argument.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.dex.Constants;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
import com.android.tools.r8.ir.optimize.Inliner.Constraint;
@@ -67,7 +67,7 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.ALWAYS;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java b/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
index 44721ae..5f1b33f 100644
--- a/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
+++ b/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
@@ -44,6 +44,12 @@
return localsAtEntry;
}
+ public void replaceLastInstruction(Instruction instruction) {
+ InstructionListIterator iterator = listIterator(getInstructions().size());
+ iterator.previous();
+ iterator.replaceCurrentInstruction(instruction);
+ }
+
public enum ThrowingInfo {
NO_THROW, CAN_THROW
}
@@ -1107,7 +1113,7 @@
catchSuccessor.splitCriticalExceptionEdges(
code.valueNumberGenerator,
newBlock -> {
- newBlock.setNumber(code.blocks.size());
+ newBlock.setNumber(code.getHighestBlockNumber() + 1);
blockIterator.add(newBlock);
});
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java b/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
index f93f996..968e560 100644
--- a/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
@@ -106,7 +106,7 @@
if (current == null) {
throw new IllegalStateException();
}
- assert current.outValue() == null || current.outValue().numberOfAllUsers() == 0;
+ assert current.outValue() == null || !current.outValue().isUsed();
for (int i = 0; i < current.inValues().size(); i++) {
Value value = current.inValues().get(i);
value.removeUser(current);
@@ -323,7 +323,7 @@
while (inlineeIterator.hasNext()) {
Instruction instruction = inlineeIterator.next();
if (instruction.isArgument()) {
- assert instruction.outValue().numberOfAllUsers() == 0;
+ assert !instruction.outValue().isUsed();
assert instruction.outValue() == arguments.get(index++);
inlineeIterator.remove();
}
@@ -349,6 +349,8 @@
List<Value> arguments = inlinee.collectArguments();
assert invoke.inValues().size() == arguments.size();
for (int i = 0; i < invoke.inValues().size(); i++) {
+ // TODO(zerny): Support inlining in --debug mode.
+ assert arguments.get(i).getDebugInfo() == null;
if ((i == 0) && (downcast != null)) {
Value invokeValue = invoke.inValues().get(0);
Value receiverValue = arguments.get(0);
diff --git a/src/main/java/com/android/tools/r8/ir/code/Binop.java b/src/main/java/com/android/tools/r8/ir/code/Binop.java
index 899516a..bcdfc22 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Binop.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Binop.java
@@ -7,7 +7,7 @@
import static com.android.tools.r8.dex.Constants.U8BIT_MAX;
import com.android.tools.r8.errors.Unreachable;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
import com.android.tools.r8.ir.optimize.Inliner.Constraint;
@@ -112,7 +112,7 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.ALWAYS;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/ConstInstruction.java b/src/main/java/com/android/tools/r8/ir/code/ConstInstruction.java
index 657faf7..8259926 100644
--- a/src/main/java/com/android/tools/r8/ir/code/ConstInstruction.java
+++ b/src/main/java/com/android/tools/r8/ir/code/ConstInstruction.java
@@ -3,6 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.ir.code;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.ir.optimize.Inliner.Constraint;
+
public abstract class ConstInstruction extends Instruction {
public ConstInstruction(Value out) {
@@ -23,4 +27,9 @@
public ConstInstruction asConstInstruction() {
return this;
}
+
+ @Override
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
+ return Constraint.ALWAYS;
+ }
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/ConstNumber.java b/src/main/java/com/android/tools/r8/ir/code/ConstNumber.java
index 0da5b43..d53c577 100644
--- a/src/main/java/com/android/tools/r8/ir/code/ConstNumber.java
+++ b/src/main/java/com/android/tools/r8/ir/code/ConstNumber.java
@@ -12,10 +12,7 @@
import com.android.tools.r8.code.ConstWide32;
import com.android.tools.r8.code.ConstWideHigh16;
import com.android.tools.r8.dex.Constants;
-import com.android.tools.r8.graph.AppInfo;
-import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
-import com.android.tools.r8.ir.optimize.Inliner.Constraint;
import com.android.tools.r8.utils.NumberUtils;
public class ConstNumber extends ConstInstruction {
@@ -186,9 +183,4 @@
public ConstNumber asConstNumber() {
return this;
}
-
- @Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
- return Constraint.ALWAYS;
- }
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/DebugPosition.java b/src/main/java/com/android/tools/r8/ir/code/DebugPosition.java
index ee6b65f..7a5acc5 100644
--- a/src/main/java/com/android/tools/r8/ir/code/DebugPosition.java
+++ b/src/main/java/com/android/tools/r8/ir/code/DebugPosition.java
@@ -64,10 +64,14 @@
@Override
public String toString() {
StringBuilder builder = new StringBuilder(super.toString());
+ printLineInfo(builder);
+ return builder.toString();
+ }
+
+ public void printLineInfo(StringBuilder builder) {
if (file != null) {
builder.append(file).append(":");
}
builder.append(line);
- return builder.toString();
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/DominatorTree.java b/src/main/java/com/android/tools/r8/ir/code/DominatorTree.java
index b5a7b75..9f28eea 100644
--- a/src/main/java/com/android/tools/r8/ir/code/DominatorTree.java
+++ b/src/main/java/com/android/tools/r8/ir/code/DominatorTree.java
@@ -87,6 +87,29 @@
return dominator;
}
+ /**
+ * Returns an iterator over all blocks dominated by dominator, including dominator itself.
+ */
+ public Iterable<BasicBlock> dominatedBlocks(BasicBlock domintator) {
+ return () -> new Iterator<BasicBlock>() {
+ private int current = domintator.getNumber();
+
+ @Override
+ public boolean hasNext() {
+ return dominatedBy(sorted[current], domintator);
+ }
+
+ @Override
+ public BasicBlock next() {
+ if (!hasNext()) {
+ return null;
+ } else {
+ return sorted[current++];
+ }
+ }
+ };
+ }
+
public BasicBlock[] getSortedBlocks() {
return sorted;
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/FieldInstruction.java b/src/main/java/com/android/tools/r8/ir/code/FieldInstruction.java
index 065d3df..ca18978 100644
--- a/src/main/java/com/android/tools/r8/ir/code/FieldInstruction.java
+++ b/src/main/java/com/android/tools/r8/ir/code/FieldInstruction.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.graph.AppInfo;
-import com.android.tools.r8.graph.DexAccessFlags;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexClass;
import com.android.tools.r8.graph.DexEncodedField;
import com.android.tools.r8.graph.DexField;
@@ -44,22 +44,17 @@
abstract DexEncodedField lookupTarget(DexType type, AppInfo appInfo);
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
// Resolve the field if possible and decide whether the instruction can inlined.
DexType fieldHolder = field.getHolder();
DexEncodedField target = lookupTarget(fieldHolder, info);
DexClass fieldClass = info.definitionFor(fieldHolder);
- if ((target != null) && (fieldClass != null) && !fieldClass.isLibraryClass()) {
- DexAccessFlags flags = target.accessFlags;
- if (flags.isPublic()) {
- return Constraint.ALWAYS;
- }
- if (flags.isPrivate() && (fieldHolder == holder)) {
- return Constraint.PRIVATE;
- }
- if (flags.isProtected() && (fieldHolder.isSamePackage(holder))) {
- return Constraint.PACKAGE;
- }
+ if ((target != null) && (fieldClass != null)) {
+ Constraint fieldConstraint = Constraint
+ .deriveConstraint(holder, fieldHolder, target.accessFlags, info);
+ Constraint classConstraint = Constraint
+ .deriveConstraint(holder, fieldHolder, fieldClass.accessFlags, info);
+ return Constraint.min(fieldConstraint, classConstraint);
}
return Constraint.NEVER;
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/IRCode.java b/src/main/java/com/android/tools/r8/ir/code/IRCode.java
index 7c37649..824d75c 100644
--- a/src/main/java/com/android/tools/r8/ir/code/IRCode.java
+++ b/src/main/java/com/android/tools/r8/ir/code/IRCode.java
@@ -390,4 +390,9 @@
public final int getHighestBlockNumber() {
return blocks.stream().max(Comparator.comparingInt(BasicBlock::getNumber)).get().getNumber();
}
+
+ public Instruction createConstNull(Instruction from) {
+ Value newValue = createValue(from.outType());
+ return new ConstNumber(ConstType.fromMoveType(from.outType()), newValue, 0);
+ }
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InstanceOf.java b/src/main/java/com/android/tools/r8/ir/code/InstanceOf.java
index 1126299..955a6cc 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InstanceOf.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InstanceOf.java
@@ -5,7 +5,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.dex.Constants;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexClass;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
@@ -75,14 +75,11 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
DexClass targetClass = info.definitionFor(type());
if (targetClass == null) {
return Constraint.NEVER;
}
- if (targetClass.accessFlags.isPublic()) {
- return Constraint.ALWAYS;
- }
- return Constraint.NEVER;
+ return Constraint.deriveConstraint(holder, type(), targetClass.accessFlags, info);
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/Instruction.java b/src/main/java/com/android/tools/r8/ir/code/Instruction.java
index 083100b..b7a18f0 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Instruction.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Instruction.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.errors.Unreachable;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DebugLocalInfo;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.code.Value.DebugInfo;
@@ -61,7 +61,7 @@
}
public void setOutValue(Value value) {
- assert outValue == null || !outValue.hasUsersInfo() || outValue.numberOfAllUsers() == 0;
+ assert outValue == null || !outValue.hasUsersInfo() || !outValue.isUsed();
outValue = value;
if (outValue != null) {
outValue.definition = this;
@@ -839,7 +839,7 @@
}
// Returns the inlining constraint for this instruction.
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.NEVER;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InstructionIterator.java b/src/main/java/com/android/tools/r8/ir/code/InstructionIterator.java
index 997b092..2cb8185 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InstructionIterator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InstructionIterator.java
@@ -4,9 +4,7 @@
package com.android.tools.r8.ir.code;
-import java.util.Iterator;
-
-public interface InstructionIterator extends Iterator<Instruction> {
+public interface InstructionIterator extends NextUntilIterator<Instruction> {
/**
* Replace the current instruction (aka the {@link Instruction} returned by the previous call to
* {@link #next} with the passed in <code>newInstruction</code>.
diff --git a/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java b/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java
index bb88b64..431d338 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java
@@ -10,7 +10,8 @@
import java.util.ListIterator;
import java.util.function.Predicate;
-public interface InstructionListIterator extends ListIterator<Instruction> {
+public interface InstructionListIterator extends ListIterator<Instruction>,
+ NextUntilIterator<Instruction> {
/**
* Peek the previous instruction.
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeDirect.java b/src/main/java/com/android/tools/r8/ir/code/InvokeDirect.java
index f11d62f..cc23ef5 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeDirect.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeDirect.java
@@ -5,12 +5,11 @@
import com.android.tools.r8.code.InvokeDirectRange;
import com.android.tools.r8.dex.Constants;
+import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.ir.conversion.DexBuilder;
-import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
-import com.android.tools.r8.ir.optimize.InliningOracle;
import java.util.List;
public class InvokeDirect extends InvokeMethodWithReceiver {
@@ -89,7 +88,7 @@
}
@Override
- public InlineAction computeInlining(InliningOracle decider) {
- return decider.computeForInvokeDirect(this);
+ DexEncodedMethod lookupTarget(AppInfo appInfo) {
+ return appInfo.lookupDirectTarget(getInvokedMethod());
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java b/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java
index 9d0c01f..a639ba1 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java
@@ -4,12 +4,11 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.code.InvokeInterfaceRange;
+import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.ir.conversion.DexBuilder;
-import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
-import com.android.tools.r8.ir.optimize.InliningOracle;
import java.util.List;
public class InvokeInterface extends InvokeMethodWithReceiver {
@@ -76,7 +75,8 @@
}
@Override
- public InlineAction computeInlining(InliningOracle decider) {
- return decider.computeForInvokeInterface(this);
+ DexEncodedMethod lookupTarget(AppInfo appInfo) {
+ DexMethod method = getInvokedMethod();
+ return appInfo.lookupVirtualDefinition(method.holder, method);
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java b/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java
index 950e31f..70201f0 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java
@@ -3,7 +3,13 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.ir.code;
+import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
+import com.android.tools.r8.graph.DexClass;
+import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.ir.optimize.Inliner.Constraint;
import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
import com.android.tools.r8.ir.optimize.InliningOracle;
import java.util.List;
@@ -46,5 +52,28 @@
return this;
}
+ abstract DexEncodedMethod lookupTarget(AppInfo appInfo);
+
+ @Override
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
+ if (method.holder.isArrayType()) {
+ return Constraint.ALWAYS;
+ }
+ DexEncodedMethod target = lookupTarget(info);
+ if (target != null) {
+ DexType methodHolder = target.method.holder;
+ DexClass methodClass = info.definitionFor(methodHolder);
+ if ((methodClass != null)) {
+ Constraint methodConstrain = Constraint
+ .deriveConstraint(holder, methodHolder, target.accessFlags, info);
+ // We also have to take the constraint of the enclosing class into account.
+ Constraint classConstraint = Constraint
+ .deriveConstraint(holder, methodHolder, methodClass.accessFlags, info);
+ return Constraint.min(methodConstrain, classConstraint);
+ }
+ }
+ return Constraint.NEVER;
+ }
+
public abstract InlineAction computeInlining(InliningOracle decider);
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java b/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java
index c83b1d2..6ccf1cc 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java
@@ -4,6 +4,8 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
+import com.android.tools.r8.ir.optimize.InliningOracle;
import java.util.List;
public abstract class InvokeMethodWithReceiver extends InvokeMethod {
@@ -31,4 +33,13 @@
public InvokeMethodWithReceiver asInvokeMethodWithReceiver() {
return this;
}
+
+ public Value getReceiver() {
+ return inValues.get(0);
+ }
+
+ @Override
+ public final InlineAction computeInlining(InliningOracle decider) {
+ return decider.computeForInvokeWithReceiver(this);
+ }
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokePolymorphic.java b/src/main/java/com/android/tools/r8/ir/code/InvokePolymorphic.java
index efc12db..5eacaa9 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokePolymorphic.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokePolymorphic.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.code.InvokePolymorphicRange;
+import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexMethod;
@@ -87,6 +88,12 @@
}
@Override
+ DexEncodedMethod lookupTarget(AppInfo appInfo) {
+ // TODO(herhut): Implement lookup target for invokePolymorphic.
+ return null;
+ }
+
+ @Override
public InlineAction computeInlining(InliningOracle decider) {
return decider.computeForInvokePolymorpic(this);
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeStatic.java b/src/main/java/com/android/tools/r8/ir/code/InvokeStatic.java
index dc22e2e..6654c16 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeStatic.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeStatic.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.code.InvokeStaticRange;
+import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexMethod;
@@ -76,6 +77,12 @@
}
@Override
+ DexEncodedMethod lookupTarget(AppInfo appInfo) {
+ DexMethod method = getInvokedMethod();
+ return appInfo.lookupStaticTarget(method);
+ }
+
+ @Override
public InlineAction computeInlining(InliningOracle decider) {
return decider.computeForInvokeStatic(this);
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeSuper.java b/src/main/java/com/android/tools/r8/ir/code/InvokeSuper.java
index fc79c11..b3d5fe4 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeSuper.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeSuper.java
@@ -4,15 +4,16 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.code.InvokeSuperRange;
+import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
-import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
-import com.android.tools.r8.ir.optimize.InliningOracle;
+import com.android.tools.r8.ir.optimize.Inliner.Constraint;
import java.util.List;
-public class InvokeSuper extends InvokeMethod {
+public class InvokeSuper extends InvokeMethodWithReceiver {
public InvokeSuper(DexMethod target, Value result, List<Value> arguments) {
super(target, result, arguments);
@@ -75,7 +76,14 @@
}
@Override
- public InlineAction computeInlining(InliningOracle decider) {
- return decider.computeForInvokeSuper(this);
+ DexEncodedMethod lookupTarget(AppInfo appInfo) {
+ DexMethod method = getInvokedMethod();
+ return appInfo.lookupVirtualDefinition(method.holder, method);
+ }
+
+ @Override
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
+ // The semantics of invoke super depend on the context.
+ return Constraint.SAMECLASS;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java b/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
index 3988980..34793c2 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
@@ -4,12 +4,11 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.code.InvokeVirtualRange;
+import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.ir.conversion.DexBuilder;
-import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
-import com.android.tools.r8.ir.optimize.InliningOracle;
import java.util.List;
public class InvokeVirtual extends InvokeMethodWithReceiver {
@@ -76,7 +75,8 @@
}
@Override
- public InlineAction computeInlining(InliningOracle decider) {
- return decider.computeForInvokeVirtual(this);
+ DexEncodedMethod lookupTarget(AppInfo appInfo) {
+ DexMethod method = getInvokedMethod();
+ return appInfo.lookupVirtualTarget(method.holder, method);
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/JumpInstruction.java b/src/main/java/com/android/tools/r8/ir/code/JumpInstruction.java
index ec9c12f..9d35ce2 100644
--- a/src/main/java/com/android/tools/r8/ir/code/JumpInstruction.java
+++ b/src/main/java/com/android/tools/r8/ir/code/JumpInstruction.java
@@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.ir.code;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.optimize.Inliner.Constraint;
import com.android.tools.r8.utils.InternalOptions;
@@ -47,7 +47,7 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.ALWAYS;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/Move.java b/src/main/java/com/android/tools/r8/ir/code/Move.java
index 91e19f0..277c63c 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Move.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Move.java
@@ -5,7 +5,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.dex.Constants;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
import com.android.tools.r8.ir.optimize.Inliner.Constraint;
@@ -81,7 +81,7 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.ALWAYS;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/MoveException.java b/src/main/java/com/android/tools/r8/ir/code/MoveException.java
index 554e71f..023e6f0 100644
--- a/src/main/java/com/android/tools/r8/ir/code/MoveException.java
+++ b/src/main/java/com/android/tools/r8/ir/code/MoveException.java
@@ -70,4 +70,16 @@
public boolean canBeDeadCode(IRCode code, InternalOptions options) {
return !options.debug;
}
+
+ @Override
+ public String toString() {
+ if (position != null) {
+ StringBuilder builder = new StringBuilder(super.toString());
+ builder.append("(DebugPosition ");
+ position.printLineInfo(builder);
+ builder.append(')');
+ return builder.toString();
+ }
+ return super.toString();
+ }
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/NextUntilIterator.java b/src/main/java/com/android/tools/r8/ir/code/NextUntilIterator.java
new file mode 100644
index 0000000..d15376e
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/ir/code/NextUntilIterator.java
@@ -0,0 +1,26 @@
+// Copyright (c) 2017, 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.code;
+
+import java.util.Iterator;
+import java.util.function.Predicate;
+
+public interface NextUntilIterator<T> extends Iterator<T> {
+
+ /**
+ * Continue to call {@link #next} while {@code predicate} tests {@code false}.
+ *
+ * @returns the item that matched the predicate or {@code null} if all items fail
+ * the predicate test
+ */
+ default T nextUntil(Predicate<T> predicate) {
+ while (hasNext()) {
+ T item = next();
+ if (predicate.test(item)) {
+ return item;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/ir/code/Phi.java b/src/main/java/com/android/tools/r8/ir/code/Phi.java
index 1abdb1d..7e05dc9 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Phi.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Phi.java
@@ -231,8 +231,11 @@
StringBuilder builder = new StringBuilder();
builder.append("v");
builder.append(number);
+ if (getLocalInfo() != null) {
+ builder.append("(").append(getLocalInfo()).append(")");
+ }
builder.append(" <- phi");
- StringUtils.append(builder, ListUtils.map(operands, (Value operand) -> "v" + operand.number));
+ StringUtils.append(builder, ListUtils.map(operands, Value::toString));
return builder.toString();
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/Return.java b/src/main/java/com/android/tools/r8/ir/code/Return.java
index 142206c..337ed71 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Return.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Return.java
@@ -8,7 +8,7 @@
import com.android.tools.r8.code.ReturnWide;
import com.android.tools.r8.dex.Constants;
import com.android.tools.r8.errors.Unreachable;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
import com.android.tools.r8.ir.optimize.Inliner.Constraint;
@@ -110,7 +110,7 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.ALWAYS;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/Throw.java b/src/main/java/com/android/tools/r8/ir/code/Throw.java
index 9bd6a81..2f9f9f7 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Throw.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Throw.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.dex.Constants;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.conversion.DexBuilder;
import com.android.tools.r8.ir.optimize.Inliner.Constraint;
@@ -63,7 +63,7 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.ALWAYS;
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/Unop.java b/src/main/java/com/android/tools/r8/ir/code/Unop.java
index 174b7b6..a534420 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Unop.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Unop.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.ir.code;
import com.android.tools.r8.dex.Constants;
-import com.android.tools.r8.graph.AppInfo;
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.ir.optimize.Inliner.Constraint;
@@ -43,7 +43,7 @@
}
@Override
- public Constraint inliningConstraint(AppInfo info, DexType holder) {
+ public Constraint inliningConstraint(AppInfoWithSubtyping info, DexType holder) {
return Constraint.ALWAYS;
}
}
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 e0bfdd0..035bf95 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
@@ -219,6 +219,12 @@
return numberOfUsers() + numberOfPhiUsers() + numberOfDebugUsers();
}
+ public boolean isUsed() {
+ return !users.isEmpty()
+ || !phiUsers.isEmpty()
+ || ((debugData != null) && !debugData.debugUsers.isEmpty());
+ }
+
public void addUser(Instruction user) {
users.add(user);
uniqueUsers = null;
@@ -503,7 +509,7 @@
public boolean isDead(InternalOptions options) {
// Totally unused values are trivially dead.
- return numberOfAllUsers() == 0 || isDead(new HashSet<>(), options);
+ return !isUsed() || isDead(new HashSet<>(), options);
}
protected boolean isDead(Set<Value> active, InternalOptions options) {
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
index 70e156b..48c8eb0 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
@@ -17,15 +17,23 @@
import com.android.tools.r8.ir.code.Invoke;
import com.android.tools.r8.ir.code.Invoke.Type;
import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
+import com.android.tools.r8.utils.InternalOptions;
+import com.android.tools.r8.utils.ThreadUtils;
import com.google.common.collect.Sets;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -45,6 +53,10 @@
*/
public class CallGraph {
+ private CallGraph(InternalOptions options) {
+ this.shuffle = options.testing.irOrdering;
+ }
+
private static class Node {
public final DexEncodedMethod method;
@@ -121,6 +133,7 @@
private final Map<DexEncodedMethod, Node> nodes = new LinkedHashMap<>();
private final Map<DexEncodedMethod, Set<DexEncodedMethod>> breakers = new HashMap<>();
+ private final Function<List<DexEncodedMethod>, List<DexEncodedMethod>> shuffle;
// Returns whether the method->callee edge has been removed from the call graph
// to break a cycle in the call graph.
@@ -133,8 +146,8 @@
private Set<DexEncodedMethod> doubleCallSite = Sets.newIdentityHashSet();
public static CallGraph build(DexApplication application, AppInfoWithSubtyping appInfo,
- GraphLense graphLense) {
- CallGraph graph = new CallGraph();
+ GraphLense graphLense, InternalOptions options) {
+ CallGraph graph = new CallGraph(options);
DexClass[] classes = application.classes().toArray(new DexClass[application.classes().size()]);
Arrays.sort(classes, (DexClass a, DexClass b) -> a.type.slowCompareTo(b.type));
for (DexClass clazz : classes) {
@@ -185,7 +198,9 @@
private static boolean allMethodsExists(DexApplication application, CallGraph graph) {
for (DexProgramClass clazz : application.classes()) {
- clazz.forEachMethod(method -> { assert graph.nodes.get(method) != null; });
+ clazz.forEachMethod(method -> {
+ assert graph.nodes.get(method) != null;
+ });
}
return true;
}
@@ -197,19 +212,19 @@
* Please note that there are no cycles in this graph (see {@link #breakCycles}).
* <p>
*
- * @return List of {@link DexEncodedMethod}.
+ * @return List of {@link DexEncodedMethod}.
*/
- List<DexEncodedMethod> extractLeaves() {
+ private List<DexEncodedMethod> extractLeaves() {
if (isEmpty()) {
- return null;
+ return Collections.emptyList();
}
// First identify all leaves before removing them from the graph.
List<Node> leaves = nodes.values().stream().filter(Node::isLeaf).collect(Collectors.toList());
- leaves.forEach( leaf -> {
- leaf.callers.forEach( caller -> caller.callees.remove(leaf));
+ leaves.forEach(leaf -> {
+ leaf.callers.forEach(caller -> caller.callees.remove(leaf));
nodes.remove(leaf.method);
});
- return leaves.stream().map( leaf -> leaf.method).collect(Collectors.toList());
+ return shuffle.apply(leaves.stream().map(leaf -> leaf.method).collect(Collectors.toList()));
}
private int traverse(Node node, Set<Node> stack, Set<Node> marked) {
@@ -253,7 +268,7 @@
int numberOfCycles = 0;
Set<Node> stack = Sets.newIdentityHashSet();
Set<Node> marked = Sets.newIdentityHashSet();
- for(Node node : nodes.values()) {
+ for (Node node : nodes.values()) {
numberOfCycles += traverse(node, stack, marked);
}
return numberOfCycles;
@@ -279,6 +294,21 @@
return nodes.size() == 0;
}
+ public void forEachMethod(Consumer<DexEncodedMethod> consumer, ExecutorService executorService)
+ throws ExecutionException {
+ while (!isEmpty()) {
+ List<DexEncodedMethod> methods = extractLeaves();
+ assert methods.size() > 0;
+ List<Future<?>> futures = new ArrayList<>();
+ for (DexEncodedMethod method : methods) {
+ futures.add(executorService.submit(() -> {
+ consumer.accept(method);
+ }));
+ }
+ ThreadUtils.awaitFutures(futures);
+ }
+ }
+
public void dump() {
nodes.forEach((m, n) -> System.out.println(n + "\n"));
}
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 51aa284..659a503 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
@@ -6,8 +6,6 @@
import static com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.Flavor.ExcludeDexResources;
import static com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.Flavor.IncludeAllResources;
-import com.google.common.collect.ImmutableSet;
-
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
@@ -34,12 +32,13 @@
import com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator;
import com.android.tools.r8.ir.regalloc.RegisterAllocator;
import com.android.tools.r8.logging.Log;
+import com.android.tools.r8.shaking.protolite.ProtoLitePruner;
import com.android.tools.r8.utils.CfgPrinter;
import com.android.tools.r8.utils.DescriptorUtils;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.ThreadUtils;
import com.android.tools.r8.utils.Timing;
-
+import com.google.common.collect.ImmutableSet;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -66,9 +65,10 @@
private final MemberValuePropagation memberValuePropagation;
private final LensCodeRewriter lensCodeRewriter;
private final Inliner inliner;
+ private final ProtoLitePruner protoLiteRewriter;
private CallGraph callGraph;
- private OptimizationFeedback ignoreOptimizationFeedback = new OptimizationFeedbackIgnore();
+ private OptimizationFeedback ignoreOptimizationFeedback = new OptimizationFeedbackIgnore();
private DexString highestSortingString;
private IRConverter(
@@ -96,16 +96,22 @@
(enableDesugaring && enableInterfaceMethodDesugaring())
? new InterfaceMethodRewriter(this) : null;
if (enableWholeProgramOptimizations) {
- assert appInfo.withSubtyping() != null;
+ assert appInfo.hasSubtyping();
this.inliner = new Inliner(appInfo.withSubtyping(), graphLense, options);
this.outliner = new Outliner(appInfo, options);
this.memberValuePropagation = new MemberValuePropagation(appInfo);
this.lensCodeRewriter = new LensCodeRewriter(graphLense, appInfo.withSubtyping());
+ if (appInfo.hasLiveness()) {
+ this.protoLiteRewriter = new ProtoLitePruner(appInfo.withLiveness());
+ } else {
+ this.protoLiteRewriter = null;
+ }
} else {
this.inliner = null;
this.outliner = null;
this.memberValuePropagation = null;
this.lensCodeRewriter = null;
+ this.protoLiteRewriter = null;
}
}
@@ -260,7 +266,7 @@
removeLambdaDeserializationMethods();
timing.begin("Build call graph");
- callGraph = CallGraph.build(application, appInfo.withSubtyping(), graphLense);
+ callGraph = CallGraph.build(application, appInfo.withSubtyping(), graphLense, options);
timing.end();
// The process is in two phases.
@@ -272,22 +278,10 @@
// Process the application identifying outlining candidates.
timing.begin("IR conversion phase 1");
OptimizationFeedback directFeedback = new OptimizationFeedbackDirect();
- while (!callGraph.isEmpty()) {
- List<DexEncodedMethod> methods = callGraph.extractLeaves();
- assert methods.size() > 0;
- // For testing we have the option to determine the processing order of the methods.
- if (options.testing.irOrdering != null) {
- methods = options.testing.irOrdering.apply(methods);
- }
- List<Future<?>> futures = new ArrayList<>();
- for (DexEncodedMethod method : methods) {
- futures.add(executorService.submit(() -> {
+ callGraph.forEachMethod(method -> {
processMethod(method, directFeedback,
outliner == null ? Outliner::noProcessing : outliner::identifyCandidates);
- }));
- }
- ThreadUtils.awaitFutures(futures);
- }
+ }, executorService);
timing.end();
// Build a new application with jumbo string info.
@@ -308,13 +302,20 @@
// add the outline support class IF needed.
DexProgramClass outlineClass = prepareOutlining();
if (outlineClass != null) {
- // Process the selected methods for outlining.
- for (DexEncodedMethod method : outliner.getMethodsSelectedForOutlining()) {
+ // We need a new call graph to ensure deterministic order and also processing inside out
+ // to get maximal inlining. Use a identity lense, as the code has been rewritten.
+ callGraph = CallGraph
+ .build(application, appInfo.withSubtyping(), GraphLense.getIdentityLense(), options);
+ Set<DexEncodedMethod> outlineMethods = outliner.getMethodsSelectedForOutlining();
+ callGraph.forEachMethod(method -> {
+ if (!outlineMethods.contains(method)) {
+ return;
+ }
// This is the second time we compile this method first mark it not processed.
assert !method.getCode().isOutlineCode();
processMethod(method, ignoreOptimizationFeedback, outliner::applyOutliningCandidate);
assert method.isProcessed();
- }
+ }, executorService);
builder.addSynthesizedClass(outlineClass, true);
clearDexMethodCompilationState(outlineClass);
}
@@ -368,6 +369,8 @@
count++;
result = application.dexItemFactory.createType(DescriptorUtils.javaTypeToDescriptor(name));
} while (application.definitionFor(result) != null);
+ // Register the newly generated type in the subtyping hierarchy, if we have one.
+ appInfo.registerNewType(result, appInfo.dexItemFactory.objectType);
return result;
}
@@ -429,15 +432,20 @@
printC1VisualizerHeader(method);
printMethod(code, "Initial IR (SSA)");
- if (lensCodeRewriter != null) {
- lensCodeRewriter.rewrite(code, method);
- } else {
- assert graphLense.isIdentityLense();
+ if (!method.isProcessed()) {
+ if (protoLiteRewriter != null && protoLiteRewriter.appliesTo(method)) {
+ protoLiteRewriter.rewriteProtoLiteSpecialMethod(code, method);
+ }
+ if (lensCodeRewriter != null) {
+ lensCodeRewriter.rewrite(code, method);
+ } else {
+ assert graphLense.isIdentityLense();
+ }
}
if (memberValuePropagation != null) {
memberValuePropagation.rewriteWithConstantValues(code);
}
- if (options.removeSwitchMaps) {
+ if (options.removeSwitchMaps && appInfo.hasLiveness()) {
// TODO(zerny): Should we support removeSwitchMaps in debug mode? b/62936642
assert !options.debug;
codeRewriter.removeSwitchMaps(code);
@@ -511,7 +519,7 @@
if (!options.inlineAccessors || inliner == null) {
state = Constraint.NEVER;
} else {
- state = inliner.identifySimpleMethods(code, method);
+ state = inliner.computeInliningConstraint(code, method);
}
feedback.markProcessed(method, state);
}
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 55e6296..0a6ea7e 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
@@ -81,6 +81,9 @@
: factory.createMethod(lambdaClassType, constructorProto, rewriter.classConstructorName);
this.instanceField = !stateless ? null
: factory.createField(lambdaClassType, lambdaClassType, rewriter.instanceFieldName);
+
+ // We have to register this new class as a subtype of object.
+ rewriter.appInfo.registerNewType(type, factory.objectType);
}
// Generate unique lambda class type for lambda descriptor and instantiation point context.
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/LambdaRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/LambdaRewriter.java
index 7d3bc33..af32cb7 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/LambdaRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/LambdaRewriter.java
@@ -5,6 +5,7 @@
package com.android.tools.r8.ir.desugar;
import com.android.tools.r8.dex.Constants;
+import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.DexApplication.Builder;
import com.android.tools.r8.graph.DexCallSite;
import com.android.tools.r8.graph.DexEncodedMethod;
@@ -57,6 +58,7 @@
static final String LAMBDA_INSTANCE_FIELD_NAME = "INSTANCE";
final IRConverter converter;
+ final AppInfo appInfo;
final DexItemFactory factory;
final DexMethod metafactoryMethod;
@@ -78,7 +80,6 @@
//
// NOTE: synchronize concurrent access on `knownCallSites`.
private final Map<DexCallSite, LambdaDescriptor> knownCallSites = new IdentityHashMap<>();
-
// Maps lambda class type into lambda class representation. Since lambda class
// type uniquely defines lambda class, effectively canonicalizes lambda classes.
// NOTE: synchronize concurrent access on `knownLambdaClasses`.
@@ -93,6 +94,7 @@
assert converter != null;
this.converter = converter;
this.factory = converter.application.dexItemFactory;
+ this.appInfo = converter.appInfo;
DexType metafactoryType = factory.createType(METAFACTORY_TYPE_DESCR);
DexType callSiteType = factory.createType(CALLSITE_TYPE_DESCR);
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 014a064..ddc83f8 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
@@ -9,12 +9,10 @@
import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.DexClass;
import com.android.tools.r8.graph.DexEncodedMethod;
-import com.android.tools.r8.graph.DexField;
import com.android.tools.r8.graph.DexItemFactory;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.graph.DexProto;
import com.android.tools.r8.graph.DexType;
-import com.android.tools.r8.ir.code.ArrayGet;
import com.android.tools.r8.ir.code.ArrayPut;
import com.android.tools.r8.ir.code.BasicBlock;
import com.android.tools.r8.ir.code.Binop;
@@ -32,7 +30,6 @@
import com.android.tools.r8.ir.code.InstructionIterator;
import com.android.tools.r8.ir.code.InstructionListIterator;
import com.android.tools.r8.ir.code.Invoke;
-import com.android.tools.r8.ir.code.InvokeDirect;
import com.android.tools.r8.ir.code.InvokeMethod;
import com.android.tools.r8.ir.code.InvokeVirtual;
import com.android.tools.r8.ir.code.MemberType;
@@ -47,6 +44,7 @@
import com.android.tools.r8.ir.code.Switch;
import com.android.tools.r8.ir.code.Value;
import com.android.tools.r8.ir.conversion.OptimizationFeedback;
+import com.android.tools.r8.ir.optimize.SwitchUtils.EnumSwitchInfo;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.LongInterval;
import com.google.common.base.Equivalence;
@@ -56,12 +54,8 @@
import com.google.common.collect.ListMultimap;
import it.unimi.dsi.fastutil.ints.Int2IntArrayMap;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap;
-import it.unimi.dsi.fastutil.ints.Int2ReferenceMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
-import it.unimi.dsi.fastutil.objects.Reference2IntArrayMap;
-import it.unimi.dsi.fastutil.objects.Reference2IntMap;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
@@ -371,8 +365,6 @@
* ...
* }
* </pre></blockquote>
- * See {@link #extractIndexMapFrom} and {@link #extractOrdinalsMapFor} for
- * details of the companion class and ordinals computation.
*/
public void removeSwitchMaps(IRCode code) {
for (BasicBlock block : code.blocks) {
@@ -382,68 +374,38 @@
// Pattern match a switch on a switch map as input.
if (insn.isSwitch()) {
Switch switchInsn = insn.asSwitch();
- Instruction input = switchInsn.inValues().get(0).definition;
- if (input == null || !input.isArrayGet()) {
- continue;
- }
- ArrayGet arrayGet = input.asArrayGet();
- Instruction index = arrayGet.index().definition;
- if (index == null || !index.isInvokeVirtual()) {
- continue;
- }
- InvokeVirtual ordinalInvoke = index.asInvokeVirtual();
- DexMethod ordinalMethod = ordinalInvoke.getInvokedMethod();
- DexClass enumClass = appInfo.definitionFor(ordinalMethod.holder);
- if (enumClass == null
- || (!enumClass.accessFlags.isEnum() && enumClass.type != dexItemFactory.enumType)
- || ordinalMethod.name != dexItemFactory.ordinalMethodName
- || ordinalMethod.proto.returnType != dexItemFactory.intType
- || !ordinalMethod.proto.parameters.isEmpty()) {
- continue;
- }
- Instruction array = arrayGet.array().definition;
- if (array == null || !array.isStaticGet()) {
- continue;
- }
- StaticGet staticGet = array.asStaticGet();
- if (staticGet.getField().name.toSourceString().startsWith("$SwitchMap$")) {
- Int2ReferenceMap<DexField> indexMap = extractIndexMapFrom(staticGet.getField());
- if (indexMap == null || indexMap.isEmpty()) {
- continue;
+ EnumSwitchInfo info = SwitchUtils
+ .analyzeSwitchOverEnum(switchInsn, appInfo.withLiveness());
+ if (info != null) {
+ Int2IntMap targetMap = new Int2IntArrayMap();
+ IntList keys = new IntArrayList(switchInsn.numberOfKeys());
+ for (int i = 0; i < switchInsn.numberOfKeys(); i++) {
+ assert switchInsn.targetBlockIndices()[i] != switchInsn.getFallthroughBlockIndex();
+ int key = info.ordinalsMap.getInt(info.indexMap.get(switchInsn.getKey(i)));
+ keys.add(key);
+ targetMap.put(key, switchInsn.targetBlockIndices()[i]);
}
- // Due to member rebinding, only the fields are certain to provide the actual enums
- // class.
- DexType switchMapHolder = indexMap.values().iterator().next().getHolder();
- Reference2IntMap ordinalsMap = extractOrdinalsMapFor(switchMapHolder);
- if (ordinalsMap != null) {
- Int2IntMap targetMap = new Int2IntArrayMap();
- IntList keys = new IntArrayList(switchInsn.numberOfKeys());
- for (int i = 0; i < switchInsn.numberOfKeys(); i++) {
- assert switchInsn.targetBlockIndices()[i] != switchInsn.getFallthroughBlockIndex();
- int key = ordinalsMap.getInt(indexMap.get(switchInsn.getKey(i)));
- keys.add(key);
- targetMap.put(key, switchInsn.targetBlockIndices()[i]);
- }
- keys.sort(Comparator.naturalOrder());
- int[] targets = new int[keys.size()];
- for (int i = 0; i < keys.size(); i++) {
- targets[i] = targetMap.get(keys.getInt(i));
- }
+ keys.sort(Comparator.naturalOrder());
+ int[] targets = new int[keys.size()];
+ for (int i = 0; i < keys.size(); i++) {
+ targets[i] = targetMap.get(keys.getInt(i));
+ }
- Switch newSwitch = new Switch(ordinalInvoke.outValue(), keys.toIntArray(),
- targets, switchInsn.getFallthroughBlockIndex());
- // Replace the switch itself.
- it.replaceCurrentInstruction(newSwitch);
- // If the original input to the switch is now unused, remove it too. It is not dead
- // as it might have side-effects but we ignore these here.
- if (arrayGet.outValue().numberOfUsers() == 0) {
- arrayGet.inValues().forEach(v -> v.removeUser(arrayGet));
- arrayGet.getBlock().removeInstruction(arrayGet);
- }
- if (staticGet.outValue().numberOfUsers() == 0) {
- assert staticGet.inValues().isEmpty();
- staticGet.getBlock().removeInstruction(staticGet);
- }
+ Switch newSwitch = new Switch(info.ordinalInvoke.outValue(), keys.toIntArray(),
+ targets, switchInsn.getFallthroughBlockIndex());
+ // Replace the switch itself.
+ it.replaceCurrentInstruction(newSwitch);
+ // If the original input to the switch is now unused, remove it too. It is not dead
+ // as it might have side-effects but we ignore these here.
+ Instruction arrayGet = info.arrayGet;
+ if (arrayGet.outValue().numberOfUsers() == 0) {
+ arrayGet.inValues().forEach(v -> v.removeUser(arrayGet));
+ arrayGet.getBlock().removeInstruction(arrayGet);
+ }
+ Instruction staticGet = info.staticGet;
+ if (staticGet.outValue().numberOfUsers() == 0) {
+ assert staticGet.inValues().isEmpty();
+ staticGet.getBlock().removeInstruction(staticGet);
}
}
}
@@ -451,152 +413,6 @@
}
}
-
- /**
- * Extracts the mapping from ordinal values to switch case constants.
- * <p>
- * This is done by pattern-matching on the class initializer of the synthetic switch map class.
- * For a switch
- *
- * <blockquote><pre>
- * switch (day) {
- * case WEDNESDAY:
- * case FRIDAY:
- * System.out.println("3 or 5");
- * break;
- * case SUNDAY:
- * System.out.println("7");
- * break;
- * default:
- * System.out.println("other");
- * }
- * </pre></blockquote>
- *
- * the generated companing class initializer will have the form
- *
- * <blockquote><pre>
- * class Switches$1 {
- * static {
- * $SwitchMap$switchmaps$Days[Days.WEDNESDAY.ordinal()] = 1;
- * $SwitchMap$switchmaps$Days[Days.FRIDAY.ordinal()] = 2;
- * $SwitchMap$switchmaps$Days[Days.SUNDAY.ordinal()] = 3;
- * }
- * </pre></blockquote>
- *
- * Note that one map per class is generated, so the map might contain additional entries as used
- * by other switches in the class.
- */
- private Int2ReferenceMap<DexField> extractIndexMapFrom(DexField field) {
- DexClass clazz = appInfo.definitionFor(field.getHolder());
- if (!clazz.accessFlags.isSynthetic()) {
- return null;
- }
- DexEncodedMethod initializer = clazz.getClassInitializer();
- if (initializer == null || initializer.getCode() == null) {
- return null;
- }
- IRCode code = initializer.getCode().buildIR(initializer, new InternalOptions());
- Int2ReferenceMap<DexField> switchMap = new Int2ReferenceArrayMap<>();
- for (BasicBlock block : code.blocks) {
- InstructionListIterator it = block.listIterator();
- Instruction insn = it.nextUntil(i -> i.isStaticGet() && i.asStaticGet().getField() == field);
- if (insn == null) {
- continue;
- }
- for (Instruction use : insn.outValue().uniqueUsers()) {
- if (use.isArrayPut()) {
- Instruction index = use.asArrayPut().source().definition;
- if (index == null || !index.isConstNumber()) {
- return null;
- }
- int integerIndex = index.asConstNumber().getIntValue();
- Instruction value = use.asArrayPut().index().definition;
- if (value == null || !value.isInvokeVirtual()) {
- return null;
- }
- InvokeVirtual invoke = value.asInvokeVirtual();
- DexClass holder = appInfo.definitionFor(invoke.getInvokedMethod().holder);
- if (holder == null ||
- (!holder.accessFlags.isEnum() && holder.type != dexItemFactory.enumType)) {
- return null;
- }
- Instruction enumGet = invoke.arguments().get(0).definition;
- if (enumGet == null || !enumGet.isStaticGet()) {
- return null;
- }
- DexField enumField = enumGet.asStaticGet().getField();
- if (!appInfo.definitionFor(enumField.getHolder()).accessFlags.isEnum()) {
- return null;
- }
- if (switchMap.put(integerIndex, enumField) != null) {
- return null;
- }
- } else {
- return null;
- }
- }
- }
- return switchMap;
- }
-
- /**
- * Extracts the ordinal values for an Enum class from the classes static initializer.
- * <p>
- * An Enum class has a field for each value. In the class initializer, each field is initialized
- * to a singleton object that represents the value. This code matches on the corresponding call
- * to the constructor (instance initializer) and extracts the value of the second argument, which
- * is the ordinal.
- */
- private Reference2IntMap<DexField> extractOrdinalsMapFor(DexType enumClass) {
- DexClass clazz = appInfo.definitionFor(enumClass);
- if (clazz == null || clazz.isLibraryClass()) {
- // We have to keep binary compatibility in tact for libraries.
- return null;
- }
- DexEncodedMethod initializer = clazz.getClassInitializer();
- if (!clazz.accessFlags.isEnum() || initializer == null || initializer.getCode() == null) {
- return null;
- }
- IRCode code = initializer.getCode().buildIR(initializer, new InternalOptions());
- Reference2IntMap<DexField> ordinalsMap = new Reference2IntArrayMap<>();
- ordinalsMap.defaultReturnValue(-1);
- InstructionIterator it = code.instructionIterator();
- while (it.hasNext()) {
- Instruction insn = it.next();
- if (!insn.isStaticPut()) {
- continue;
- }
- StaticPut staticPut = insn.asStaticPut();
- if (staticPut.getField().type != enumClass) {
- continue;
- }
- Instruction newInstance = staticPut.inValue().definition;
- if (newInstance == null || !newInstance.isNewInstance()) {
- continue;
- }
- Instruction ordinal = null;
- for (Instruction ctorCall : newInstance.outValue().uniqueUsers()) {
- if (!ctorCall.isInvokeDirect()) {
- continue;
- }
- InvokeDirect invoke = ctorCall.asInvokeDirect();
- if (!dexItemFactory.isConstructor(invoke.getInvokedMethod())
- || invoke.arguments().size() < 3) {
- continue;
- }
- ordinal = invoke.arguments().get(2).definition;
- break;
- }
- if (ordinal == null || !ordinal.isConstNumber()) {
- return null;
- }
- if (ordinalsMap.put(staticPut.getField(), ordinal.asConstNumber().getIntValue()) != -1) {
- return null;
- }
- }
- return ordinalsMap;
- }
-
/**
* Rewrite all branch targets to the destination of trivial goto chains when possible.
* Does not rewrite fallthrough targets as that would require block reordering and the
@@ -693,7 +509,7 @@
Instruction current = iterator.next();
if (current.isInvokeMethod()) {
InvokeMethod invoke = current.asInvokeMethod();
- if (invoke.outValue() != null) {
+ if (invoke.outValue() != null && invoke.outValue().getLocalInfo() == null) {
DexEncodedMethod target = invoke.computeSingleTarget(appInfo.withSubtyping());
// We have a set of library classes with optimization information - consider those
// as well.
@@ -1283,7 +1099,7 @@
}
}
assert theIf == block.exit();
- replaceLastInstruction(block, new Goto());
+ block.replaceLastInstruction(new Goto());
assert block.exit().isGoto();
assert block.exit().asGoto().getTarget() == target;
}
@@ -1306,7 +1122,7 @@
int left = leftValue.getConstInstruction().asConstNumber().getIntValue();
if (left == 0) {
If ifz = new If(theIf.getType().forSwappedOperands(), rightValue);
- replaceLastInstruction(block, ifz);
+ block.replaceLastInstruction(ifz);
assert block.exit() == ifz;
}
} else {
@@ -1314,19 +1130,13 @@
int right = rightValue.getConstInstruction().asConstNumber().getIntValue();
if (right == 0) {
If ifz = new If(theIf.getType(), leftValue);
- replaceLastInstruction(block, ifz);
+ block.replaceLastInstruction(ifz);
assert block.exit() == ifz;
}
}
}
}
- private void replaceLastInstruction(BasicBlock block, Instruction instruction) {
- InstructionListIterator iterator = block.listIterator(block.getInstructions().size());
- iterator.previous();
- iterator.replaceCurrentInstruction(instruction);
- }
-
public void rewriteLongCompareAndRequireNonNull(IRCode code, InternalOptions options) {
if (options.canUseLongCompareAndObjectsNonNull()) {
return;
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java b/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java
index b683f3a..3a1902e 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java
@@ -105,7 +105,7 @@
// Remove unused invoke results.
if (current.isInvoke()
&& current.outValue() != null
- && current.outValue().numberOfAllUsers() == 0) {
+ && !current.outValue().isUsed()) {
current.setOutValue(null);
}
// Never remove instructions that can have side effects, except for const-class.
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/EnumOrdinalMapCollector.java b/src/main/java/com/android/tools/r8/ir/optimize/EnumOrdinalMapCollector.java
new file mode 100644
index 0000000..b2ebecc
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/ir/optimize/EnumOrdinalMapCollector.java
@@ -0,0 +1,102 @@
+// Copyright (c) 2017, 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 com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexField;
+import com.android.tools.r8.graph.DexProgramClass;
+import com.android.tools.r8.graph.DexType;
+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.InvokeDirect;
+import com.android.tools.r8.ir.code.StaticPut;
+import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
+import com.android.tools.r8.utils.InternalOptions;
+import it.unimi.dsi.fastutil.objects.Reference2IntArrayMap;
+import it.unimi.dsi.fastutil.objects.Reference2IntMap;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+/**
+ * Extracts the ordinal values for all Enum classes from their static initializer.
+ * <p>
+ * An Enum class has a field for each value. In the class initializer, each field is initialized
+ * to a singleton object that represents the value. This code matches on the corresponding call
+ * to the constructor (instance initializer) and extracts the value of the second argument, which
+ * is the ordinal.
+ */
+public class EnumOrdinalMapCollector {
+
+ private final AppInfoWithLiveness appInfo;
+ private final InternalOptions options;
+
+ private final Map<DexType, Reference2IntMap<DexField>> ordinalsMaps = new IdentityHashMap<>();
+
+ public EnumOrdinalMapCollector(AppInfoWithLiveness appInfo, InternalOptions options) {
+ this.appInfo = appInfo;
+ this.options = options;
+ }
+
+ public static Reference2IntMap<DexField> getOrdinalsMapFor(DexType enumClass,
+ AppInfoWithLiveness appInfo) {
+ Map<DexType, Reference2IntMap<DexField>> ordinalsMaps = appInfo
+ .getExtension(EnumOrdinalMapCollector.class, Collections.emptyMap());
+ return ordinalsMaps.get(enumClass);
+ }
+
+ public void run() {
+ appInfo.classes().forEach(this::processClasses);
+ if (!ordinalsMaps.isEmpty()) {
+ appInfo.setExtension(EnumOrdinalMapCollector.class, ordinalsMaps);
+ }
+ }
+
+ private void processClasses(DexProgramClass clazz) {
+ // Enum classes are flagged as such. Also, for library classes, the ordinals are not known.
+ if (!clazz.accessFlags.isEnum() || clazz.isLibraryClass() || !clazz.hasClassInitializer()) {
+ return;
+ }
+ DexEncodedMethod initializer = clazz.getClassInitializer();
+ IRCode code = initializer.getCode().buildIR(initializer, options);
+ Reference2IntMap<DexField> ordinalsMap = new Reference2IntArrayMap<>();
+ ordinalsMap.defaultReturnValue(-1);
+ InstructionIterator it = code.instructionIterator();
+ while (it.hasNext()) {
+ Instruction insn = it.next();
+ if (!insn.isStaticPut()) {
+ continue;
+ }
+ StaticPut staticPut = insn.asStaticPut();
+ if (staticPut.getField().type != clazz.type) {
+ continue;
+ }
+ Instruction newInstance = staticPut.inValue().definition;
+ if (newInstance == null || !newInstance.isNewInstance()) {
+ continue;
+ }
+ Instruction ordinal = null;
+ for (Instruction ctorCall : newInstance.outValue().uniqueUsers()) {
+ if (!ctorCall.isInvokeDirect()) {
+ continue;
+ }
+ InvokeDirect invoke = ctorCall.asInvokeDirect();
+ if (!appInfo.dexItemFactory.isConstructor(invoke.getInvokedMethod())
+ || invoke.arguments().size() < 3) {
+ continue;
+ }
+ ordinal = invoke.arguments().get(2).definition;
+ break;
+ }
+ if (ordinal == null || !ordinal.isConstNumber()) {
+ return;
+ }
+ if (ordinalsMap.put(staticPut.getField(), ordinal.asConstNumber().getIntValue()) != -1) {
+ return;
+ }
+ }
+ ordinalsMaps.put(clazz.type, ordinalsMap);
+ }
+}
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 a2b3ba2..942e8f0 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
@@ -4,8 +4,12 @@
package com.android.tools.r8.ir.optimize;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
-import com.android.tools.r8.graph.DexCode;
+import com.android.tools.r8.graph.DexAccessFlags;
+import com.android.tools.r8.graph.DexClass;
+import com.android.tools.r8.graph.DexEncodedField;
import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexField;
+import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.graph.GraphLense;
import com.android.tools.r8.ir.code.BasicBlock;
@@ -31,11 +35,10 @@
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
public class Inliner {
- private static final int INLINING_INSTRUCTION_LIMIT = 5;
-
protected final AppInfoWithSubtyping appInfo;
private final GraphLense graphLense;
private final InternalOptions options;
@@ -61,50 +64,43 @@
return result;
}
- public Constraint identifySimpleMethods(IRCode code, DexEncodedMethod method) {
- DexCode dex = method.getCode().asDexCode();
- // We have generated code for a method and we want to figure out whether the method is a
- // candidate for inlining. The code is the final IR after optimizations.
- if (dex.instructions.length > INLINING_INSTRUCTION_LIMIT) {
- return Constraint.NEVER;
- }
+ public Constraint computeInliningConstraint(IRCode code, DexEncodedMethod method) {
Constraint result = Constraint.ALWAYS;
- ListIterator<BasicBlock> iterator = code.listIterator();
- assert iterator.hasNext();
- BasicBlock block = iterator.next();
- BasicBlock nextBlock;
- do {
- nextBlock = iterator.hasNext() ? iterator.next() : null;
- InstructionListIterator it = block.listIterator();
- while (it.hasNext()) {
- Instruction instruction = it.next();
- Constraint state = instructionAllowedForInlining(method, instruction);
- if (state == Constraint.NEVER) {
- return Constraint.NEVER;
- }
- if (state.ordinal() < result.ordinal()) {
- result = state;
- }
+ InstructionIterator it = code.instructionIterator();
+ while (it.hasNext()) {
+ Instruction instruction = it.next();
+ Constraint state = instructionAllowedForInlining(method, instruction);
+ if (state == Constraint.NEVER) {
+ return Constraint.NEVER;
}
- block = nextBlock;
- } while (block != null);
+ if (state.ordinal() < result.ordinal()) {
+ result = state;
+ }
+ }
return result;
}
boolean hasInliningAccess(DexEncodedMethod method, DexEncodedMethod target) {
- if (target.accessFlags.isPublic()) {
+ if (!isVisibleWithFlags(target.method.holder, method.method.holder, target.accessFlags)) {
+ return false;
+ }
+ // The class needs also to be visible for us to have access.
+ DexClass targetClass = appInfo.definitionFor(target.method.holder);
+ return isVisibleWithFlags(target.method.holder, method.method.holder, targetClass.accessFlags);
+ }
+
+ private boolean isVisibleWithFlags(DexType target, DexType context, DexAccessFlags flags) {
+ if (flags.isPublic()) {
return true;
}
- DexType methodHolder = method.method.getHolder();
- DexType targetHolder = target.method.getHolder();
- if (target.accessFlags.isPrivate()) {
- return methodHolder == targetHolder;
+ if (flags.isPrivate()) {
+ return target == context;
}
- if (target.accessFlags.isProtected() &&
- methodHolder.isSubtypeOf(targetHolder, appInfo)) {
- return true;
+ if (flags.isProtected()) {
+ return context.isSubtypeOf(target, appInfo) || target.isSamePackage(context);
}
- return methodHolder.isSamePackage(targetHolder);
+ // package-private
+ return target.isSamePackage(context);
}
synchronized DexEncodedMethod doubleInlining(DexEncodedMethod method,
@@ -134,21 +130,70 @@
OptimizationFeedback feedback) {
if (doubleInlineCallers.size() > 0) {
applyDoubleInlining = true;
- for (DexEncodedMethod method : doubleInlineCallers) {
+ List<DexEncodedMethod> methods = doubleInlineCallers
+ .stream()
+ .sorted(DexEncodedMethod::slowCompare)
+ .collect(Collectors.toList());
+ for (DexEncodedMethod method : methods) {
converter.processMethod(method, feedback, Outliner::noProcessing);
assert method.isProcessed();
}
}
}
+ /**
+ * Encodes the constraints for inlining a method's instructions into a different context.
+ * <p>
+ * This only takes the instructions into account and not whether a method should be inlined
+ * or what reason for inlining it might have. Also, it does not take the visibility of the
+ * method itself into account.
+ */
public enum Constraint {
// The ordinal values are important so please do not reorder.
- NEVER, // Never inline this.
- PRIVATE, // Only inline this into methods with same holder.
- PACKAGE, // Only inline this into methods with holders from same package.
- ALWAYS, // No restrictions for inlining this.
+ NEVER, // Never inline this.
+ SAMECLASS, // Only inline this into methods with same holder.
+ PACKAGE, // Only inline this into methods with holders from same package.
+ SUBCLASS, // Only inline this into methods with holders from a subclass.
+ ALWAYS; // No restrictions for inlining this.
+
+ static {
+ assert NEVER.ordinal() < SAMECLASS.ordinal();
+ assert SAMECLASS.ordinal() < PACKAGE.ordinal();
+ assert PACKAGE.ordinal() < SUBCLASS.ordinal();
+ assert SUBCLASS.ordinal() < ALWAYS.ordinal();
+ }
+
+ public static Constraint deriveConstraint(DexType contextHolder, DexType targetHolder,
+ DexAccessFlags flags, AppInfoWithSubtyping appInfo) {
+ if (flags.isPublic()) {
+ return ALWAYS;
+ } else if (flags.isPrivate()) {
+ return targetHolder == contextHolder ? SAMECLASS : NEVER;
+ } else if (flags.isProtected()) {
+ if (targetHolder.isSamePackage(contextHolder)) {
+ // Even though protected, this is visible via the same package from the context.
+ return PACKAGE;
+ } else if (contextHolder.isSubtypeOf(targetHolder, appInfo)) {
+ return SUBCLASS;
+ }
+ return NEVER;
+ } else {
+ /* package-private */
+ return targetHolder.isSamePackage(contextHolder) ? PACKAGE : NEVER;
+ }
+ }
+
+ public static Constraint min(Constraint one, Constraint other) {
+ return one.ordinal() < other.ordinal() ? one : other;
+ }
}
+ /**
+ * Encodes the reason why a method should be inlined.
+ * <p>
+ * This is independent of determining whether a method can be inlined, except for the FORCE
+ * state, that will inline a method irrespective of visibility and instruction checks.
+ */
public enum Reason {
FORCE, // Inlinee is marked for forced inlining (bridge method or renamed constructor).
SINGLE_CALLER, // Inlinee has precisely one caller.
@@ -199,38 +244,66 @@
return numOfInstructions;
}
- private boolean legalConstructorInline(DexEncodedMethod method, IRCode code) {
+ private boolean legalConstructorInline(DexEncodedMethod method,
+ InvokeMethod invoke, IRCode code) {
// In the Java VM Specification section "4.10.2.4. Instance Initialization Methods and
// Newly Created Objects" it says:
//
// Before that method invokes another instance initialization method of myClass or its direct
// superclass on this, the only operation the method can perform on this is assigning fields
// declared within myClass.
- //
- // Allow inlining a constructor into a constructor, as the constructor code is expected to
- // adhere to the VM specification.
- if (method.accessFlags.isConstructor()) {
+ // Allow inlining a constructor into a constructor of the same class, as the constructor code
+ // is expected to adhere to the VM specification.
+ DexType methodHolder = method.method.holder;
+ boolean methodIsConstructor = method.isInstanceInitializer();
+ if (methodIsConstructor && methodHolder == invoke.asInvokeMethod().getInvokedMethod().holder) {
return true;
}
// Don't allow inlining a constructor into a non-constructor if the first use of the
// un-initialized object is not an argument of an invoke of <init>.
+ // Also, we cannot inline a constructor if it initializes final fields, as such is only allowed
+ // from within a constructor of the corresponding class.
+ // Lastly, we can only inline a constructor, if its own <init> call is on the method's class. If
+ // we inline into a constructor, calls to super.<init> are also OK.
InstructionIterator iterator = code.instructionIterator();
Instruction instruction = iterator.next();
// A constructor always has the un-initialized object as the first argument.
assert instruction.isArgument();
Value unInitializedObject = instruction.outValue();
+ boolean seenSuperInvoke = false;
while (iterator.hasNext()) {
instruction = iterator.next();
if (instruction.inValues().contains(unInitializedObject)) {
- return instruction.isInvokeDirect()
- && appInfo.dexItemFactory
- .isConstructor(instruction.asInvokeDirect().getInvokedMethod());
+ if (instruction.isInvokeDirect() && !seenSuperInvoke) {
+ DexMethod target = instruction.asInvokeDirect().getInvokedMethod();
+ seenSuperInvoke = appInfo.dexItemFactory.isConstructor(target);
+ if (seenSuperInvoke
+ // Calls to init on same class are always OK.
+ && target.holder != methodHolder
+ // If we are inlining into a constructor, calls to superclass init are OK.
+ && (!methodHolder.isImmediateSubtypeOf(target.holder) || !methodIsConstructor)) {
+ return false;
+ }
+ }
+ if (!seenSuperInvoke) {
+ return false;
+ }
+ }
+ if (instruction.isInstancePut()) {
+ // Fields may not be initialized outside of a constructor.
+ if (!methodIsConstructor) {
+ return false;
+ }
+ DexField field = instruction.asInstancePut().getField();
+ DexEncodedField target = appInfo.lookupInstanceTarget(field.getHolder(), field);
+ if (target != null && target.accessFlags.isFinal()) {
+ return false;
+ }
}
}
- assert false : "Execution should never reach this point";
- return false;
+ return true;
}
/// Computer the receiver value for the holder method.
@@ -250,8 +323,7 @@
return;
}
computeReceiverMustBeNonNull(code);
- Value receiver = receiverValue(method, code);
- InliningOracle oracle = new InliningOracle(this, method, receiver, callGraph);
+ InliningOracle oracle = new InliningOracle(this, method, callGraph);
List<BasicBlock> blocksToRemove = new ArrayList<>();
ListIterator<BasicBlock> blockIterator = code.listIterator();
@@ -272,8 +344,7 @@
// The declared target cannot be found so skip inlining.
continue;
}
- boolean forceInline = result.reason == Reason.FORCE;
- if (!target.isProcessed() && !forceInline) {
+ if (!(target.isProcessed() || result.reason == Reason.FORCE)) {
// Do not inline code that was not processed unless we have to force inline.
continue;
}
@@ -291,20 +362,16 @@
// If this code did not go through the full pipeline, apply inlining to make sure
// that force inline targets get processed.
if (!target.isProcessed()) {
- assert forceInline;
+ assert result.reason == Reason.FORCE;
if (Log.ENABLED) {
Log.verbose(getClass(), "Forcing extra inline on " + target.toSourceString());
}
performInlining(target, inlinee, callGraph);
}
// Make sure constructor inlining is legal.
- if (target.accessFlags.isConstructor() && !legalConstructorInline(method, inlinee)) {
- continue;
- }
- // Ensure the container is compatible with the target.
- if (!forceInline
- && !result.target.isPublicInlining()
- && (method.method.getHolder() != result.target.method.getHolder())) {
+ assert !target.isClassInitializer();
+ if (target.isInstanceInitializer()
+ && !legalConstructorInline(method, invoke, inlinee)) {
continue;
}
DexType downcast = null;
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/InliningOracle.java b/src/main/java/com/android/tools/r8/ir/optimize/InliningOracle.java
index 446b75a..fb6c2eb 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/InliningOracle.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/InliningOracle.java
@@ -3,18 +3,14 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.ir.optimize;
+import com.android.tools.r8.graph.Code;
import com.android.tools.r8.graph.DexClass;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.DexType;
-import com.android.tools.r8.ir.code.InvokeDirect;
-import com.android.tools.r8.ir.code.InvokeInterface;
import com.android.tools.r8.ir.code.InvokeMethod;
import com.android.tools.r8.ir.code.InvokeMethodWithReceiver;
import com.android.tools.r8.ir.code.InvokePolymorphic;
import com.android.tools.r8.ir.code.InvokeStatic;
-import com.android.tools.r8.ir.code.InvokeSuper;
-import com.android.tools.r8.ir.code.InvokeVirtual;
-import com.android.tools.r8.ir.code.Value;
import com.android.tools.r8.ir.conversion.CallGraph;
import com.android.tools.r8.ir.optimize.Inliner.InlineAction;
import com.android.tools.r8.ir.optimize.Inliner.Reason;
@@ -26,20 +22,19 @@
*/
public class InliningOracle {
- final Inliner inliner;
- final DexEncodedMethod method;
- final Value receiver;
- final CallGraph callGraph;
- final private InliningInfo info;
+ private static final int INLINING_INSTRUCTION_LIMIT = 5;
+
+ private final Inliner inliner;
+ private final DexEncodedMethod method;
+ private final CallGraph callGraph;
+ private final InliningInfo info;
public InliningOracle(
Inliner inliner,
DexEncodedMethod method,
- Value receiver,
CallGraph callGraph) {
this.inliner = inliner;
this.method = method;
- this.receiver = receiver;
this.callGraph = callGraph;
info = Log.ENABLED ? new InliningInfo(method) : null;
}
@@ -50,7 +45,7 @@
}
}
- DexEncodedMethod validateCandidate(InvokeMethod invoke) {
+ private DexEncodedMethod validateCandidate(InvokeMethod invoke) {
DexEncodedMethod candidate = invoke.computeSingleTarget(inliner.appInfo);
if ((candidate == null)
|| (candidate.getCode() == null)
@@ -60,32 +55,6 @@
}
return null;
}
- if (method == candidate) {
- // Cannot handle recursive inlining at this point.
- // Bridge methods should never have recursive calls.
- assert !candidate.getOptimizationInfo().forceInline();
- return null;
- }
-
- if (candidate.accessFlags.isSynchronized()) {
- // Don't inline if target is synchronized.
- if (info != null) {
- info.exclude(invoke, "Inlinee candidate is synchronized");
- }
- return null;
- }
-
- if (callGraph.isBreaker(method, candidate)) {
- // Cycle breaker so abort to preserve compilation order.
- return null;
- }
-
- if (!inliner.hasInliningAccess(method, candidate)) {
- if (info != null) {
- info.exclude(invoke, "Inlinee candidate does not have right access flags");
- }
- return null;
- }
return candidate;
}
@@ -102,104 +71,6 @@
return Reason.SIMPLE;
}
- public InlineAction computeForInvokeWithReceiver(InvokeMethodWithReceiver invoke) {
- boolean receiverIsNeverNull = invoke.receiverIsNeverNull();
- if (!receiverIsNeverNull) {
- if (info != null) {
- info.exclude(invoke, "receiver for candidate can be null");
- }
- return null;
- }
- DexEncodedMethod target = invoke.computeSingleTarget(inliner.appInfo);
- if (target == null) {
- // Abort inlining attempt if we cannot find single target.
- if (info != null) {
- info.exclude(invoke, "could not find single target");
- }
- return null;
- }
-
- if (target == method) {
- // Bridge methods should never have recursive calls.
- assert !target.getOptimizationInfo().forceInline();
- return null;
- }
-
- if (target.getCode() == null) {
- return null;
- }
-
- DexClass holder = inliner.appInfo.definitionFor(target.method.getHolder());
- if (holder.isInterface()) {
- // Art978_virtual_interfaceTest correctly expects an IncompatibleClassChangeError exception at runtime.
- if (info != null) {
- info.exclude(invoke, "Do not inline target if method holder is an interface class");
- }
- return null;
- }
-
- if (holder.isLibraryClass()) {
- // Library functions should not be inlined.
- return null;
- }
-
- // Don't inline if target is synchronized.
- if (target.accessFlags.isSynchronized()) {
- if (info != null) {
- info.exclude(invoke, "target is synchronized");
- }
- return null;
- }
-
- Reason reason = computeInliningReason(target);
- // Determine if this should be inlined no matter how big it is.
- if (!target.isInliningCandidate(method, reason != Reason.SIMPLE)) {
- // Abort inlining attempt if the single target is not an inlining candidate.
- if (info != null) {
- info.exclude(invoke, "target is not identified for inlining");
- }
- return null;
- }
-
- if (callGraph.isBreaker(method, target)) {
- // Cycle breaker so abort to preserve compilation order.
- return null;
- }
-
- // Abort inlining attempt if method -> target access is not right.
- if (!inliner.hasInliningAccess(method, target)) {
- if (info != null) {
- info.exclude(invoke, "target does not have right access");
- }
- return null;
- }
-
- // Attempt to inline a candidate that is only called twice.
- if ((reason == Reason.DUAL_CALLER) && (inliner.doubleInlining(method, target) == null)) {
- if (info != null) {
- info.exclude(invoke, "target is not ready for double inlining");
- }
- return null;
- }
-
- if (info != null) {
- info.include(invoke.getType(), target);
- }
- return new InlineAction(target, invoke, reason);
- }
-
- public InlineAction computeForInvokeVirtual(InvokeVirtual invoke) {
- return computeForInvokeWithReceiver(invoke);
- }
-
- public InlineAction computeForInvokeInterface(InvokeInterface invoke) {
- return computeForInvokeWithReceiver(invoke);
- }
-
- public InlineAction computeForInvokeDirect(InvokeDirect invoke) {
- return computeForInvokeWithReceiver(invoke);
- }
-
private boolean canInlineStaticInvoke(DexEncodedMethod method, DexEncodedMethod target) {
// Only proceed with inlining a static invoke if:
// - the holder for the target equals the holder for the method, or
@@ -209,7 +80,9 @@
return true;
}
DexClass clazz = inliner.appInfo.definitionFor(targetHolder);
- return (clazz != null) && (!clazz.hasNonTrivialClassInitializer());
+ return (clazz != null)
+ && (!clazz.hasNonTrivialClassInitializer())
+ && (!clazz.defaultValuesForStaticFieldsMayTriggerAllocation());
}
private synchronized boolean isDoubleInliningTarget(DexEncodedMethod candidate) {
@@ -219,14 +92,113 @@
&& (candidate.getCode().asDexCode().instructions.length <= 10);
}
+ private boolean passesInliningConstraints(InvokeMethod invoke, DexEncodedMethod candidate,
+ Reason reason) {
+ if (callGraph.isBreaker(method, candidate)) {
+ // Cycle breaker so abort to preserve compilation order.
+ return false;
+ }
+
+ if (method == candidate) {
+ // Cannot handle recursive inlining at this point.
+ // Force inlined method should never be recursive.
+ assert !candidate.getOptimizationInfo().forceInline();
+ if (info != null) {
+ info.exclude(invoke, "direct recursion");
+ }
+ return false;
+ }
+
+ // Abort inlining attempt if method -> target access is not right.
+ if (!inliner.hasInliningAccess(method, candidate)) {
+ if (info != null) {
+ info.exclude(invoke, "target does not have right access");
+ }
+ return false;
+ }
+
+ DexClass holder = inliner.appInfo.definitionFor(candidate.method.getHolder());
+ if (holder.isInterface()) {
+ // Art978_virtual_interfaceTest correctly expects an IncompatibleClassChangeError exception at
+ // runtime.
+ if (info != null) {
+ info.exclude(invoke, "Do not inline target if method holder is an interface class");
+ }
+ return false;
+ }
+
+ if (holder.isLibraryClass()) {
+ // Library functions should not be inlined.
+ return false;
+ }
+
+ // Don't inline if target is synchronized.
+ if (candidate.accessFlags.isSynchronized()) {
+ if (info != null) {
+ info.exclude(invoke, "target is synchronized");
+ }
+ return false;
+ }
+
+ // Attempt to inline a candidate that is only called twice.
+ if ((reason == Reason.DUAL_CALLER) && (inliner.doubleInlining(method, candidate) == null)) {
+ if (info != null) {
+ info.exclude(invoke, "target is not ready for double inlining");
+ }
+ return false;
+ }
+
+ if (reason == Reason.SIMPLE) {
+ // If we are looking for a simple method, only inline if actually simple.
+ Code code = candidate.getCode();
+ if (code.estimatedSizeForInlining() > INLINING_INSTRUCTION_LIMIT) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public InlineAction computeForInvokeWithReceiver(InvokeMethodWithReceiver invoke) {
+ boolean receiverIsNeverNull = invoke.receiverIsNeverNull();
+ if (!receiverIsNeverNull) {
+ if (info != null) {
+ info.exclude(invoke, "receiver for candidate can be null");
+ }
+ return null;
+ }
+ DexEncodedMethod candidate = validateCandidate(invoke);
+ if (candidate == null) {
+ return null;
+ }
+
+ Reason reason = computeInliningReason(candidate);
+ if (!candidate.isInliningCandidate(method, reason == Reason.FORCE, inliner.appInfo)) {
+ // Abort inlining attempt if the single target is not an inlining candidate.
+ if (info != null) {
+ info.exclude(invoke, "target is not identified for inlining");
+ }
+ return null;
+ }
+
+ if (!passesInliningConstraints(invoke, candidate, reason)) {
+ return null;
+ }
+
+ if (info != null) {
+ info.include(invoke.getType(), candidate);
+ }
+ return new InlineAction(candidate, invoke, reason);
+ }
+
public InlineAction computeForInvokeStatic(InvokeStatic invoke) {
DexEncodedMethod candidate = validateCandidate(invoke);
if (candidate == null) {
return null;
}
+
Reason reason = computeInliningReason(candidate);
// Determine if this should be inlined no matter how big it is.
- if (!candidate.isInliningCandidate(method, reason != Reason.SIMPLE)) {
+ if (!candidate.isInliningCandidate(method, reason == Reason.FORCE, inliner.appInfo)) {
// Abort inlining attempt if the single target is not an inlining candidate.
if (info != null) {
info.exclude(invoke, "target is not identified for inlining");
@@ -242,11 +214,7 @@
return null;
}
- // Attempt to inline a candidate that is only called twice.
- if ((reason == Reason.DUAL_CALLER) && (inliner.doubleInlining(method, candidate) == null)) {
- if (info != null) {
- info.exclude(invoke, "target is not ready for double inlining");
- }
+ if (!passesInliningConstraints(invoke, candidate, reason)) {
return null;
}
@@ -256,20 +224,6 @@
return new InlineAction(candidate, invoke, reason);
}
- public InlineAction computeForInvokeSuper(InvokeSuper invoke) {
- DexEncodedMethod candidate = validateCandidate(invoke);
- if (candidate == null) {
- if (info != null) {
- info.exclude(invoke, "not a valid inlining target");
- }
- return null;
- }
- if (info != null) {
- info.include(invoke.getType(), candidate);
- }
- return new InlineAction(candidate, invoke, Reason.SIMPLE);
- }
-
public InlineAction computeForInvokePolymorpic(InvokePolymorphic invoke) {
// TODO: No inlining of invoke polymorphic for now.
if (info != null) {
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 8a02435..a34c8cb 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
@@ -137,10 +137,10 @@
ProguardMemberRuleLookup lookup = lookupMemberRule(definition);
if (lookup != null) {
if (lookup.type == RuleType.ASSUME_NO_SIDE_EFFECTS
- && (invoke.outValue() == null || invoke.outValue().numberOfAllUsers() == 0)) {
+ && (invoke.outValue() == null || !invoke.outValue().isUsed())) {
iterator.remove();
invokeReplaced = true;
- } else {
+ } else if (invoke.outValue() != null && invoke.outValue().isUsed()) {
// Check to see if a constant value can be assumed.
Instruction replacement =
constantReplacementFromProguardRule(lookup.rule, code, invoke);
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java b/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java
index c2e804e..3857c1f 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java
@@ -400,7 +400,7 @@
// Allow all new-instance instructions in a outline.
if (instruction.isNewInstance()) {
- if (instruction.outValue().numberOfAllUsers() > 0) {
+ if (instruction.outValue().isUsed()) {
// Track the new-instance value to make sure the <init> call is part of the outline.
pendingNewInstanceIndex = index;
}
@@ -711,7 +711,7 @@
}
}
assert m.proto.shorty.toString().length() - 1 == in.size();
- if (returnValue != null && returnValue.numberOfAllUsers() == 0) {
+ if (returnValue != null && !returnValue.isUsed()) {
returnValue = null;
}
Invoke outlineInvoke = new InvokeStatic(m, returnValue, in);
@@ -958,6 +958,12 @@
}
@Override
+ public int estimatedSizeForInlining() {
+ // We just onlined this, so do not inline it again.
+ return Integer.MAX_VALUE;
+ }
+
+ @Override
public OutlineCode asOutlineCode() {
return this;
}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/SwitchMapCollector.java b/src/main/java/com/android/tools/r8/ir/optimize/SwitchMapCollector.java
new file mode 100644
index 0000000..44f0759
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/ir/optimize/SwitchMapCollector.java
@@ -0,0 +1,155 @@
+// Copyright (c) 2017, 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 com.android.tools.r8.graph.DexClass;
+import com.android.tools.r8.graph.DexEncodedField;
+import com.android.tools.r8.graph.DexField;
+import com.android.tools.r8.graph.DexProgramClass;
+import com.android.tools.r8.graph.DexString;
+import com.android.tools.r8.graph.DexType;
+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.InvokeVirtual;
+import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
+import com.android.tools.r8.utils.InternalOptions;
+import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2ReferenceMap;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * Extracts the mapping from ordinal values to switch case constants.
+ * <p>
+ * This is done by pattern-matching on the class initializer of the synthetic switch map class.
+ * For a switch
+ *
+ * <blockquote><pre>
+ * switch (day) {
+ * case WEDNESDAY:
+ * case FRIDAY:
+ * System.out.println("3 or 5");
+ * break;
+ * case SUNDAY:
+ * System.out.println("7");
+ * break;
+ * default:
+ * System.out.println("other");
+ * }
+ * </pre></blockquote>
+ *
+ * the generated companing class initializer will have the form
+ *
+ * <blockquote><pre>
+ * class Switches$1 {
+ * static {
+ * $SwitchMap$switchmaps$Days[Days.WEDNESDAY.ordinal()] = 1;
+ * $SwitchMap$switchmaps$Days[Days.FRIDAY.ordinal()] = 2;
+ * $SwitchMap$switchmaps$Days[Days.SUNDAY.ordinal()] = 3;
+ * }
+ * </pre></blockquote>
+ *
+ * Note that one map per class is generated, so the map might contain additional entries as used
+ * by other switches in the class.
+ */
+public class SwitchMapCollector {
+
+ private final AppInfoWithLiveness appInfo;
+ private final InternalOptions options;
+ private final DexString switchMapPrefix;
+ private final DexType intArrayType;
+
+ private final Map<DexField, Int2ReferenceMap<DexField>> switchMaps = new IdentityHashMap<>();
+
+ public SwitchMapCollector(AppInfoWithLiveness appInfo, InternalOptions options) {
+ this.appInfo = appInfo;
+ this.options = options;
+ switchMapPrefix = appInfo.dexItemFactory.createString("$SwitchMap$");
+ intArrayType = appInfo.dexItemFactory.createType("[I");
+ }
+
+ public void run() {
+ appInfo.classes().forEach(this::processClasses);
+ if (!switchMaps.isEmpty()) {
+ appInfo.setExtension(SwitchMapCollector.class, switchMaps);
+ }
+ }
+
+ public static Int2ReferenceMap<DexField> getSwitchMapFor(DexField field,
+ AppInfoWithLiveness appInfo) {
+ Map<DexField, Int2ReferenceMap<DexField>> switchMaps = appInfo
+ .getExtension(SwitchMapCollector.class, Collections.emptyMap());
+ return switchMaps.get(field);
+ }
+
+ private void processClasses(DexProgramClass clazz) {
+ // Switchmap classes are synthetic and have a class initializer.
+ if (!clazz.accessFlags.isSynthetic() && !clazz.hasClassInitializer()) {
+ return;
+ }
+ List<DexEncodedField> switchMapFields = Arrays.stream(clazz.staticFields())
+ .filter(this::maybeIsSwitchMap).collect(Collectors.toList());
+ if (!switchMapFields.isEmpty()) {
+ IRCode initializer = clazz.getClassInitializer().buildIR(options);
+ switchMapFields.forEach(field -> extractSwitchMap(field, initializer));
+ }
+ }
+
+ private void extractSwitchMap(DexEncodedField encodedField, IRCode initializer) {
+ DexField field = encodedField.field;
+ Int2ReferenceMap<DexField> switchMap = new Int2ReferenceArrayMap<>();
+ InstructionIterator it = initializer.instructionIterator();
+ Instruction insn;
+ Predicate<Instruction> predicate = i -> i.isStaticGet() && i.asStaticGet().getField() == field;
+ while ((insn = it.nextUntil(predicate)) != null) {
+ for (Instruction use : insn.outValue().uniqueUsers()) {
+ if (use.isArrayPut()) {
+ Instruction index = use.asArrayPut().source().definition;
+ if (index == null || !index.isConstNumber()) {
+ return;
+ }
+ int integerIndex = index.asConstNumber().getIntValue();
+ Instruction value = use.asArrayPut().index().definition;
+ if (value == null || !value.isInvokeVirtual()) {
+ return;
+ }
+ InvokeVirtual invoke = value.asInvokeVirtual();
+ DexClass holder = appInfo.definitionFor(invoke.getInvokedMethod().holder);
+ if (holder == null ||
+ (!holder.accessFlags.isEnum() && holder.type != appInfo.dexItemFactory.enumType)) {
+ return;
+ }
+ Instruction enumGet = invoke.arguments().get(0).definition;
+ if (enumGet == null || !enumGet.isStaticGet()) {
+ return;
+ }
+ DexField enumField = enumGet.asStaticGet().getField();
+ if (!appInfo.definitionFor(enumField.getHolder()).accessFlags.isEnum()) {
+ return;
+ }
+ if (switchMap.put(integerIndex, enumField) != null) {
+ return;
+ }
+ } else {
+ return;
+ }
+ }
+ }
+ switchMaps.put(field, switchMap);
+ }
+
+ private boolean maybeIsSwitchMap(DexEncodedField dexEncodedField) {
+ // We are looking for synthetic fields of type int[].
+ DexField field = dexEncodedField.field;
+ return dexEncodedField.accessFlags.isSynthetic()
+ && field.name.beginsWith(switchMapPrefix)
+ && field.type == intArrayType;
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/SwitchUtils.java b/src/main/java/com/android/tools/r8/ir/optimize/SwitchUtils.java
new file mode 100644
index 0000000..0c33561
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/ir/optimize/SwitchUtils.java
@@ -0,0 +1,102 @@
+// Copyright (c) 2017, 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 com.android.tools.r8.graph.DexClass;
+import com.android.tools.r8.graph.DexField;
+import com.android.tools.r8.graph.DexItemFactory;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.ir.code.ArrayGet;
+import com.android.tools.r8.ir.code.Instruction;
+import com.android.tools.r8.ir.code.InvokeVirtual;
+import com.android.tools.r8.ir.code.StaticGet;
+import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
+import it.unimi.dsi.fastutil.ints.Int2ReferenceMap;
+import it.unimi.dsi.fastutil.objects.Reference2IntMap;
+
+public class SwitchUtils {
+
+ public static final class EnumSwitchInfo {
+ public final DexType enumClass;
+ public final Instruction ordinalInvoke;
+ public final Instruction arrayGet;
+ public final Instruction staticGet;
+ public final Int2ReferenceMap<DexField> indexMap;
+ public final Reference2IntMap ordinalsMap;
+
+ private EnumSwitchInfo(DexType enumClass,
+ Instruction ordinalInvoke,
+ Instruction arrayGet, Instruction staticGet,
+ Int2ReferenceMap<DexField> indexMap,
+ Reference2IntMap ordinalsMap) {
+ this.enumClass = enumClass;
+ this.ordinalInvoke = ordinalInvoke;
+ this.arrayGet = arrayGet;
+ this.staticGet = staticGet;
+ this.indexMap = indexMap;
+ this.ordinalsMap = ordinalsMap;
+ }
+ }
+
+ /**
+ * Looks for a switch statement over the enum companion class of the form
+ *
+ * <blockquote><pre>
+ * switch(CompanionClass.$switchmap$field[enumValue.ordinal()]) {
+ * ...
+ * }
+ * </pre></blockquote>
+ *
+ * and extracts the components and the index and ordinal maps. See
+ * {@link EnumOrdinalMapCollector} and
+ * {@link SwitchMapCollector} for details.
+ */
+ public static EnumSwitchInfo analyzeSwitchOverEnum(Instruction switchInsn,
+ AppInfoWithLiveness appInfo) {
+ Instruction input = switchInsn.inValues().get(0).definition;
+ if (input == null || !input.isArrayGet()) {
+ return null;
+ }
+ ArrayGet arrayGet = input.asArrayGet();
+ Instruction index = arrayGet.index().definition;
+ if (index == null || !index.isInvokeVirtual()) {
+ return null;
+ }
+ InvokeVirtual ordinalInvoke = index.asInvokeVirtual();
+ DexMethod ordinalMethod = ordinalInvoke.getInvokedMethod();
+ DexClass enumClass = appInfo.definitionFor(ordinalMethod.holder);
+ DexItemFactory dexItemFactory = appInfo.dexItemFactory;
+ // After member rebinding, enumClass will be the actual java.lang.Enum class.
+ if (enumClass == null
+ || (!enumClass.accessFlags.isEnum() && enumClass.type != dexItemFactory.enumType)
+ || ordinalMethod.name != dexItemFactory.ordinalMethodName
+ || ordinalMethod.proto.returnType != dexItemFactory.intType
+ || !ordinalMethod.proto.parameters.isEmpty()) {
+ return null;
+ }
+ Instruction array = arrayGet.array().definition;
+ if (array == null || !array.isStaticGet()) {
+ return null;
+ }
+ StaticGet staticGet = array.asStaticGet();
+ Int2ReferenceMap<DexField> indexMap
+ = SwitchMapCollector.getSwitchMapFor(staticGet.getField(), appInfo);
+ if (indexMap == null || indexMap.isEmpty()) {
+ return null;
+ }
+ // Due to member rebinding, only the fields are certain to provide the actual enums
+ // class.
+ DexType enumTyoe = indexMap.values().iterator().next().getHolder();
+ Reference2IntMap ordinalsMap
+ = EnumOrdinalMapCollector.getOrdinalsMapFor(enumTyoe, appInfo);
+ if (ordinalsMap == null) {
+ return null;
+ }
+ return new EnumSwitchInfo(enumTyoe, ordinalInvoke, arrayGet, staticGet, indexMap,
+ ordinalsMap);
+ }
+
+
+}
diff --git a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
index 99767fd..38cdb29 100644
--- a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
+++ b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
@@ -292,19 +292,22 @@
for (BasicBlock block : blocks) {
ListIterator<Instruction> instructionIterator = block.listIterator();
- // Update ranges up-to but excluding the index of the first instruction.
+ // Close ranges up-to and including the first instruction. Ends are exclusive so the range is
+ // closed at entry.
int entryIndex = block.entry().getNumber();
{
ListIterator<LocalRange> it = openRanges.listIterator(0);
while (it.hasNext()) {
LocalRange openRange = it.next();
- if (openRange.end < entryIndex) {
+ if (openRange.end <= entryIndex) {
it.remove();
assert currentLocals.get(openRange.register) == openRange.local;
currentLocals.remove(openRange.register);
}
}
}
+ // Open ranges up-to but excluding the first instruction. Starts are inclusive but entry is
+ // prior to the first instruction.
while (nextStartingRange != null && nextStartingRange.start < entryIndex) {
// If the range is live at this index open it.
if (entryIndex < nextStartingRange.end) {
@@ -315,13 +318,21 @@
nextStartingRange = rangeIterator.hasNext() ? rangeIterator.next() : null;
}
if (block.entry().isMoveException()) {
- fixupSpillMovesAtMoveException(block, instructionIterator, openRanges, currentLocals);
+ fixupLocalsLiveAtMoveException(block, instructionIterator, openRanges, currentLocals);
} else {
block.setLocalsAtEntry(new Int2ReferenceOpenHashMap<>(currentLocals));
}
+ int spillCount = 0;
while (instructionIterator.hasNext()) {
Instruction instruction = instructionIterator.next();
int index = instruction.getNumber();
+ if (index == -1) {
+ spillCount++;
+ continue;
+ }
+ // If there is more than one spill instruction we may need to end clobbered locals.
+ Int2ReferenceMap<DebugLocalInfo> preSpillLocals =
+ spillCount > 1 ? new Int2ReferenceOpenHashMap<>(currentLocals) : null;
ListIterator<LocalRange> it = openRanges.listIterator(0);
Int2ReferenceMap<DebugLocalInfo> ending = new Int2ReferenceOpenHashMap<>();
Int2ReferenceMap<DebugLocalInfo> starting = new Int2ReferenceOpenHashMap<>();
@@ -346,6 +357,18 @@
}
nextStartingRange = rangeIterator.hasNext() ? rangeIterator.next() : null;
}
+ if (preSpillLocals != null) {
+ for (int i = 0; i <= spillCount; i++) {
+ instructionIterator.previous();
+ }
+ Int2ReferenceMap<DebugLocalInfo> clobbered =
+ endClobberedLocals(instructionIterator, preSpillLocals, currentLocals);
+ for (Entry<DebugLocalInfo> entry : clobbered.int2ReferenceEntrySet()) {
+ assert ending.get(entry.getIntKey()) == entry.getValue();
+ ending.remove(entry.getIntKey());
+ }
+ }
+ spillCount = 0;
if (localsChanged && shouldEmitChangesAtInstruction(instruction)) {
DebugLocalsChange change = createLocalsChange(ending, starting);
if (change != null) {
@@ -363,7 +386,7 @@
}
}
- private void fixupSpillMovesAtMoveException(
+ private void fixupLocalsLiveAtMoveException(
BasicBlock block,
ListIterator<Instruction> instructionIterator,
List<LocalRange> openRanges,
@@ -378,42 +401,15 @@
Instruction entry = instructionIterator.next();
assert block.entry() == entry;
assert block.entry().isMoveException();
- Iterator<Instruction> moveIterator = block.iterator();
- moveIterator.next();
- int index = entry.getNumber();
- Int2ReferenceMap<DebugLocalInfo> clobberedLocals = new Int2ReferenceOpenHashMap<>();
- while (moveIterator.hasNext()) {
- Instruction next = moveIterator.next();
- if (next.getNumber() != -1) {
- break;
- }
- if (clobberedLocals.isEmpty()) {
- // Advance the iterator so it ends up at the first move that clobbers a local.
- instructionIterator.next();
- }
- if (next.isMove()) {
- Move move = next.asMove();
- int dstRegister = getArgumentOrAllocateRegisterForValue(move.dest(), index);
- DebugLocalInfo dstInitialLocal = initialLocals.get(dstRegister);
- DebugLocalInfo dstFinalLocal = finalLocals.get(dstRegister);
- if (dstInitialLocal != null && dstInitialLocal != dstFinalLocal) {
- initialLocals.remove(dstRegister);
- clobberedLocals.put(dstRegister, dstInitialLocal);
- }
- }
- }
- // Add an initial local change for all clobbered locals after the first clobbered local.
- if (!clobberedLocals.isEmpty()) {
- instructionIterator.add(new DebugLocalsChange(
- clobberedLocals, Int2ReferenceMaps.emptyMap()));
- }
- // Compute the final change in locals and emit it after all spill moves.
- while (instructionIterator.hasNext()) {
- if (instructionIterator.next().getNumber() != -1) {
- break;
- }
+ // Moves may have clobber current locals so they must be closed.
+ Int2ReferenceMap<DebugLocalInfo> clobbered =
+ endClobberedLocals(instructionIterator, initialLocals, finalLocals);
+ for (Entry<DebugLocalInfo> ended : clobbered.int2ReferenceEntrySet()) {
+ assert initialLocals.get(ended.getIntKey()) == ended.getValue();
+ initialLocals.remove(ended.getIntKey());
}
instructionIterator.previous();
+ // Compute the final change in locals and insert it after the last move.
Int2ReferenceMap<DebugLocalInfo> ending = new Int2ReferenceOpenHashMap<>();
Int2ReferenceMap<DebugLocalInfo> starting = new Int2ReferenceOpenHashMap<>();
for (Entry<DebugLocalInfo> initialLocal : initialLocals.int2ReferenceEntrySet()) {
@@ -432,6 +428,57 @@
}
}
+ private Int2ReferenceMap<DebugLocalInfo> endClobberedLocals(
+ ListIterator<Instruction> instructionIterator,
+ Int2ReferenceMap<DebugLocalInfo> initialLocals,
+ Int2ReferenceMap<DebugLocalInfo> finalLocals) {
+ if (!options.singleStepDebug) {
+ while (instructionIterator.hasNext()) {
+ if (instructionIterator.next().getNumber() != -1) {
+ break;
+ }
+ }
+ return Int2ReferenceMaps.emptyMap();
+ }
+ // TODO(zerny): Investigate supporting accurate single stepping through spill instructions.
+ // The current code should preferably be updated to account for moving locals and not just
+ // end their scope.
+ int spillCount;
+ int firstClobberedMove = -1;
+ Int2ReferenceMap<DebugLocalInfo> clobberedLocals = Int2ReferenceMaps.emptyMap();
+ for (spillCount = 0; instructionIterator.hasNext(); spillCount++) {
+ Instruction next = instructionIterator.next();
+ if (next.getNumber() != -1) {
+ break;
+ }
+ if (next.isMove()) {
+ Move move = next.asMove();
+ int dst = getRegisterForValue(move.dest(), move.getNumber());
+ DebugLocalInfo initialLocal = initialLocals.get(dst);
+ if (initialLocal != null && initialLocal != finalLocals.get(dst)) {
+ if (firstClobberedMove == -1) {
+ firstClobberedMove = spillCount;
+ clobberedLocals = new Int2ReferenceOpenHashMap<>();
+ }
+ clobberedLocals.put(dst, initialLocal);
+ }
+ }
+ }
+ // Add an initial local change for all clobbered locals after the first clobbered local.
+ if (firstClobberedMove != -1) {
+ int tail = spillCount - firstClobberedMove;
+ for (int i = 0; i < tail; i++) {
+ instructionIterator.previous();
+ }
+ instructionIterator.add(new DebugLocalsChange(
+ clobberedLocals, Int2ReferenceMaps.emptyMap()));
+ for (int i = 0; i < tail; i++) {
+ instructionIterator.next();
+ }
+ }
+ return clobberedLocals;
+ }
+
private DebugLocalsChange createLocalsChange(
Int2ReferenceMap<DebugLocalInfo> ending, Int2ReferenceMap<DebugLocalInfo> starting) {
if (ending.isEmpty() && starting.isEmpty()) {
@@ -1908,7 +1955,7 @@
// For instructions that define values which have no use create a live range covering
// the instruction. This will typically be instructions that can have side effects even
// if their output is not used.
- if (definition.numberOfAllUsers() == 0) {
+ if (!definition.isUsed()) {
addLiveRange(definition, block, instruction.getNumber() + INSTRUCTION_NUMBER_DELTA);
}
live.remove(definition);
diff --git a/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java b/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java
index eb66537..bd7efce 100644
--- a/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java
@@ -155,6 +155,7 @@
if (receiver != null) {
receiverValue = builder.writeRegister(receiverRegister, MoveType.OBJECT, NO_THROW);
builder.add(new Argument(receiverValue));
+ receiverValue.markAsThis();
}
// Fill in the Argument instructions in the argument block.
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 b8fa85a..d25c4bc 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -37,12 +37,14 @@
import com.google.common.collect.Sets;
import com.google.common.collect.Sets.SetView;
import java.util.ArrayDeque;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Queue;
@@ -75,6 +77,9 @@
private Map<DexType, Set<DexField>> staticFieldsRead = Maps.newIdentityHashMap();
private Map<DexType, Set<DexField>> staticFieldsWritten = Maps.newIdentityHashMap();
+ private final List<SemanticsProvider> extensions = new ArrayList<>();
+ private final Map<Class, Object> extensionsState = new HashMap<>();
+
/**
* This map keeps a view of all virtual methods that are reachable from virtual invokes. A method
* is reachable even if no live subtypes exist, so this is not sufficient for inclusion in the
@@ -152,6 +157,10 @@
this.appInfo = appInfo;
}
+ public void addExtension(SemanticsProvider extension) {
+ extensions.add(extension);
+ }
+
private void enqueueRootItems(Map<DexItem, ProguardKeepRule> items) {
workList.addAll(
items.entrySet().stream().map(Action::forRootItem).collect(Collectors.toList()));
@@ -852,7 +861,21 @@
for (DexAnnotationSet parameterAnnotation : method.parameterAnnotations.values) {
processAnnotations(parameterAnnotation.annotations);
}
- method.registerReachableDefinitions(new UseRegistry(method));
+ boolean processed = false;
+ if (!extensions.isEmpty()) {
+ for (SemanticsProvider extension : extensions) {
+ if (extension.appliesTo(method)) {
+ assert extensions.stream().filter(e -> e.appliesTo(method)).count() == 1;
+ extensionsState.put(extension.getClass(),
+ extension.processMethod(method, new UseRegistry(method),
+ extensionsState.get(extension.getClass())));
+ processed = true;
+ }
+ }
+ }
+ if (!processed) {
+ method.registerReachableDefinitions(new UseRegistry(method));
+ }
// Add all dependent members to the workqueue.
enqueueRootItems(rootSet.getDependentItems(method));
}
@@ -1007,7 +1030,7 @@
* Set of fields that belong to live classes and can be reached by invokes. These need to be
* kept.
*/
- final Set<DexField> liveFields;
+ public final Set<DexField> liveFields;
/**
* Set of all fields which may be touched by a get operation. This is actual field definitions.
*/
@@ -1060,6 +1083,10 @@
* All items with assumevalues rule.
*/
public final Map<DexItem, ProguardMemberRule> assumedValues;
+ /**
+ * Map from the class of an extension to the state it produced.
+ */
+ public final Map<Class, Object> extensions;
private AppInfoWithLiveness(AppInfoWithSubtyping appInfo, Enqueuer enqueuer) {
super(appInfo);
@@ -1081,6 +1108,7 @@
this.staticInvokes = joinInvokedMethods(enqueuer.staticInvokes);
this.noSideEffects = enqueuer.rootSet.noSideEffects;
this.assumedValues = enqueuer.rootSet.assumedValues;
+ this.extensions = enqueuer.extensionsState;
assert Sets.intersection(instanceFieldReads, staticFieldReads).size() == 0;
assert Sets.intersection(instanceFieldWrites, staticFieldWrites).size() == 0;
}
@@ -1106,6 +1134,7 @@
this.superInvokes = previous.superInvokes;
this.directInvokes = previous.directInvokes;
this.staticInvokes = previous.staticInvokes;
+ this.extensions = previous.extensions;
assert Sets.intersection(instanceFieldReads, staticFieldReads).size() == 0;
assert Sets.intersection(instanceFieldWrites, staticFieldWrites).size() == 0;
}
@@ -1131,6 +1160,7 @@
this.superInvokes = rewriteItems(previous.superInvokes, lense::lookupMethod);
this.directInvokes = rewriteItems(previous.directInvokes, lense::lookupMethod);
this.staticInvokes = rewriteItems(previous.staticInvokes, lense::lookupMethod);
+ this.extensions = previous.extensions;
assert Sets.intersection(instanceFieldReads, staticFieldReads).size() == 0;
assert Sets.intersection(instanceFieldWrites, staticFieldWrites).size() == 0;
}
@@ -1159,6 +1189,20 @@
return builder.build();
}
+ @SuppressWarnings("unchecked")
+ public <T> T getExtension(Class extension, T defaultValue) {
+ if (extensions.containsKey(extension)) {
+ return (T) extensions.get(extension);
+ } else {
+ return defaultValue;
+ }
+ }
+
+ public <T> void setExtension(Class extension, T value) {
+ assert !extensions.containsKey(extension);
+ extensions.put(extension, value);
+ }
+
@Override
public boolean hasLiveness() {
return true;
@@ -1299,4 +1343,12 @@
return false;
}
}
+
+ public interface SemanticsProvider {
+
+ boolean appliesTo(DexEncodedMethod method);
+
+ Object processMethod(DexEncodedMethod method,
+ com.android.tools.r8.graph.UseRegistry useRegistry, Object state);
+ }
}
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java
index 71a4dc6..0338533 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java
@@ -22,6 +22,8 @@
private String packagePrefix = null;
private boolean allowAccessModification = false;
private boolean ignoreWarnings = false;
+ private boolean optimize = true;
+ private int optimizationPasses = 1;
private boolean obfuscating = true;
private boolean shrinking = true;
private boolean printUsage = false;
@@ -63,6 +65,15 @@
this.ignoreWarnings = ignoreWarnings;
}
+ public void setOptimize(boolean optimize) {
+ this.optimize = optimize;
+ }
+
+ public void setOptimizationPasses(int optimizationPasses) {
+ // TODO(b/36800551): no-op until we have clear ideas about optimization passes.
+ // this.optimizationPasses = optimizationPasses;
+ }
+
public void setObfuscating(boolean obfuscate) {
this.obfuscating = obfuscate;
}
@@ -131,6 +142,7 @@
packagePrefix,
allowAccessModification,
ignoreWarnings,
+ optimize ? optimizationPasses : 0,
obfuscating,
shrinking,
printUsage,
@@ -155,6 +167,7 @@
private final String packagePrefix;
private final boolean allowAccessModification;
private final boolean ignoreWarnings;
+ private final int optimizationPasses;
private final boolean obfuscating;
private final boolean shrinking;
private final boolean printUsage;
@@ -178,6 +191,7 @@
String packagePrefix,
boolean allowAccessModification,
boolean ignoreWarnings,
+ int optimizationPasses,
boolean obfuscating,
boolean shrinking,
boolean printUsage,
@@ -199,6 +213,7 @@
this.packagePrefix = packagePrefix;
this.allowAccessModification = allowAccessModification;
this.ignoreWarnings = ignoreWarnings;
+ this.optimizationPasses = optimizationPasses;
this.obfuscating = obfuscating;
this.shrinking = shrinking;
this.printUsage = printUsage;
@@ -259,6 +274,10 @@
return ignoreWarnings;
}
+ public int getOptimizationPasses() {
+ return optimizationPasses;
+ }
+
public boolean isObfuscating() {
return obfuscating;
}
@@ -317,6 +336,7 @@
"" /* package prefix */,
false /* allowAccessModification */,
false /* ignoreWarnings */,
+ 1 /* optimizationPasses */,
false /* obfuscating */,
false /* shrinking */,
false /* printUsage */,
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
index cc29125..17e5128 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -38,7 +38,6 @@
private static final List<String> ignoredSingleArgOptions = ImmutableList
.of("protomapping",
- "optimizationpasses",
"target");
private static final List<String> ignoredOptionalSingleArgOptions = ImmutableList
.of("keepdirectories", "runtype", "laststageoutput");
@@ -63,7 +62,7 @@
"outjars",
"adaptresourcefilecontents");
private static final List<String> warnedFlagOptions = ImmutableList
- .of("dontoptimize");
+ .of();
// Those options are unsupported and are treated as compilation errors.
// Just ignoring them would produce outputs incompatible with user expectations.
@@ -96,7 +95,7 @@
private int position = 0;
private Path baseDirectory;
- public ProguardFileParser(Path path) throws IOException {
+ ProguardFileParser(Path path) throws IOException {
this.path = path;
contents = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
baseDirectory = path.getParent();
@@ -149,6 +148,17 @@
} else if (acceptString("whyareyoukeeping")) {
ProguardKeepRule rule = parseWhyAreYouKeepingRule();
configurationBuilder.addRule(rule);
+ } else if (acceptString("dontoptimize")) {
+ configurationBuilder.setOptimize(false);
+ System.out.println("WARNING: Ignoring option: -dontoptimize");
+ } else if (acceptString("optimizationpasses")) {
+ skipWhitespace();
+ Integer expectedOptimizationPasses = acceptInteger();
+ if (expectedOptimizationPasses == null) {
+ throw parseError("Missing n of \"-optimizationpasses n\"");
+ }
+ configurationBuilder.setOptimizationPasses(expectedOptimizationPasses);
+ System.out.println("WARNING: Ignoring option: -optimizationpasses");
} else if (acceptString("dontobfuscate")) {
configurationBuilder.setObfuscating(false);
} else if (acceptString("dontshrink")) {
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardMemberRule.java b/src/main/java/com/android/tools/r8/shaking/ProguardMemberRule.java
index 1e2d6d4..f3e6c6f 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardMemberRule.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardMemberRule.java
@@ -200,7 +200,7 @@
public boolean matches(DexEncodedMethod method, RootSetBuilder builder) {
switch (getRuleType()) {
case ALL_METHODS:
- if (method.accessFlags.isConstructor() && method.accessFlags.isStatic()) {
+ if (method.isClassInitializer()) {
break;
}
case ALL:
diff --git a/src/main/java/com/android/tools/r8/shaking/SimpleClassMerger.java b/src/main/java/com/android/tools/r8/shaking/SimpleClassMerger.java
index e01439d..d3306d9 100644
--- a/src/main/java/com/android/tools/r8/shaking/SimpleClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/SimpleClassMerger.java
@@ -379,7 +379,7 @@
private DexEncodedMethod renameConstructors(DexEncodedMethod method) {
// Only rename instance initializers.
- if (!method.accessFlags.isConstructor() || method.accessFlags.isStatic()) {
+ if (!method.isInstanceInitializer()) {
return method;
}
DexType holder = method.method.holder;
diff --git a/src/main/java/com/android/tools/r8/shaking/TreePruner.java b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
index 2a5c9e0..d8fd6c2 100644
--- a/src/main/java/com/android/tools/r8/shaking/TreePruner.java
+++ b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
@@ -113,7 +113,7 @@
}
private boolean isDefaultConstructor(DexEncodedMethod method) {
- return method.accessFlags.isConstructor() && !method.accessFlags.isStatic()
+ return method.isInstanceInitializer()
&& method.method.proto.parameters.isEmpty();
}
diff --git a/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLiteBase.java b/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLiteBase.java
new file mode 100644
index 0000000..c2264f2
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLiteBase.java
@@ -0,0 +1,98 @@
+// Copyright (c) 2017, 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.protolite;
+
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
+import com.android.tools.r8.graph.DexClass;
+import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexField;
+import com.android.tools.r8.graph.DexItemFactory;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.DexString;
+import com.android.tools.r8.graph.DexType;
+
+/**
+ * Contains common definitions used by the {@link ProtoLiteExtension} for tree shaking and the
+ * corresponding {@link ProtoLitePruner} code rewriting.
+ */
+abstract class ProtoLiteBase {
+
+ static final int GETTER_NAME_PREFIX_LENGTH = 3;
+ static final int COUNT_POSTFIX_LENGTH = 5;
+
+ final AppInfoWithSubtyping appInfo;
+
+ final DexType messageType;
+ final DexString dynamicMethodName;
+ final DexString writeToMethodName;
+ final DexString getSerializedSizeMethodName;
+ final DexString constructorMethodName;
+ final DexString setterNamePrefix;
+ final DexString getterNamePrefix;
+ final DexString bitFieldPrefix;
+ final DexString underscore;
+
+ ProtoLiteBase(AppInfoWithSubtyping appInfo) {
+ this.appInfo = appInfo;
+ DexItemFactory factory = appInfo.dexItemFactory;
+ this.messageType = factory.createType("Lcom/google/protobuf/GeneratedMessageLite;");
+ this.dynamicMethodName = factory.createString("dynamicMethod");
+ this.writeToMethodName = factory.createString("writeTo");
+ this.getSerializedSizeMethodName = factory.createString("getSerializedSize");
+ this.constructorMethodName = factory.constructorMethodName;
+ this.setterNamePrefix = factory.createString("set");
+ this.getterNamePrefix = factory.createString("get");
+ this.bitFieldPrefix = factory.createString("bitField");
+ this.underscore = factory.createString("_");
+ assert getterNamePrefix.size == GETTER_NAME_PREFIX_LENGTH;
+ }
+
+ /**
+ * Returns true of the given method is a setter on a message class that does need processing
+ * by this phase of proto lite shaking.
+ * <p>
+ * False positives are ok.
+ */
+ abstract boolean isSetterThatNeedsProcessing(DexEncodedMethod method);
+
+ DexField getterToField(DexMethod getter) {
+ return getterToField(getter, 0);
+ }
+
+ DexField getterToField(DexMethod getter, int postfixLength) {
+ String getterName = getter.name.toString();
+ assert getterName.length() > GETTER_NAME_PREFIX_LENGTH + postfixLength;
+ String fieldName = Character.toLowerCase(getterName.charAt(GETTER_NAME_PREFIX_LENGTH))
+ + getterName.substring(GETTER_NAME_PREFIX_LENGTH + 1, getterName.length() - postfixLength)
+ + "_";
+ DexItemFactory factory = appInfo.dexItemFactory;
+ return factory
+ .createField(getter.holder, getter.proto.returnType, factory.createString(fieldName));
+ }
+
+ boolean hasSingleIntArgument(DexMethod method) {
+ return method.getArity() == 1
+ && method.proto.parameters.values[0] == appInfo.dexItemFactory.intType;
+ }
+
+ public boolean appliesTo(DexEncodedMethod method) {
+ if (!method.method.holder.isSubtypeOf(messageType, appInfo)) {
+ return false;
+ }
+ DexClass clazz = appInfo.definitionFor(method.method.holder);
+ // We only care for the actual leaf classes that implement a specific proto.
+ if (!clazz.accessFlags.isFinal()) {
+ return false;
+ }
+ DexString methodName = method.method.name;
+ // We could be even more precise here and check for the signature. However, there is only
+ // one of each method generated.
+ return methodName == dynamicMethodName
+ || methodName == writeToMethodName
+ || methodName == getSerializedSizeMethodName
+ || methodName == constructorMethodName
+ || isSetterThatNeedsProcessing(method);
+ }
+
+}
diff --git a/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLiteExtension.java b/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLiteExtension.java
new file mode 100644
index 0000000..b217194
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLiteExtension.java
@@ -0,0 +1,208 @@
+// Copyright (c) 2017, 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.protolite;
+
+import com.android.tools.r8.graph.AppInfoWithSubtyping;
+import com.android.tools.r8.graph.DelegatingUseRegistry;
+import com.android.tools.r8.graph.DexClass;
+import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexField;
+import com.android.tools.r8.graph.DexItemFactory;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.DexString;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.graph.UseRegistry;
+import com.android.tools.r8.shaking.Enqueuer.SemanticsProvider;
+import com.android.tools.r8.utils.MethodJavaSignatureEquivalence;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Equivalence.Wrapper;
+import com.google.common.collect.Sets;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Extends the tree shaker with special treatment for ProtoLite generated classes.
+ * <p>
+ * The goal is to remove unused fields from proto classes. To achieve this, we filter the
+ * dependency processing of certain methods of ProtoLite classes. Read/write references to
+ * fields or corresponding getters are ignored. If the fields or getters are not used otherwise
+ * in the program, they will be pruned even though they are referenced from the processed
+ * ProtoLite class.
+ * <p>
+ * The companion code rewriter in {@link ProtoLitePruner} then fixes up the code and removes
+ * references to these dead fields and getters in a semantics preserving way. For proto2, the
+ * fields are turned into unknown fields and hence are preserved over the wire. For proto3, the
+ * fields are removed and, as with unknown fields in proto3, their data is lost on retransmission.
+ * <p>
+ * We have to process the following three methods specially:
+ * <dl>
+ * <dt>dynamicMethod</dt>
+ * <dd>implements most proto operations, like merging, comparing, etc</dd>
+ * <dt>writeTo</dt>
+ * <dd>performs the actual write operations</dd>
+ * <dt>getSerializedSize</dt>
+ * <dd>implements computing the serialized size of a proto, very similar to writeTo</dd>
+ * </dl>
+ * As they access all fields of a proto, regardless of whether they are used, we have to mask
+ * their accesses to ensure actually dead fields are not made live.
+ * <p>
+ * We also have to treat setters specially. While their code does not need to be rewritten, we
+ * need to ensure that the fields they write are actually kept and marked as live. We achieve
+ * this by also marking them read.
+ */
+public class ProtoLiteExtension extends ProtoLiteBase implements SemanticsProvider {
+
+ private final Equivalence<DexMethod> equivalence = MethodJavaSignatureEquivalence.get();
+ /**
+ * Set of all methods directly defined on the GeneratedMessageLite class. Used to filter
+ * getters from other methods that begin with get.
+ */
+ private final Set<Wrapper<DexMethod>> methodsOnMessageType;
+
+ private final DexString caseGetterSuffix;
+ private final DexString caseFieldSuffix;
+
+ public ProtoLiteExtension(AppInfoWithSubtyping appInfo) {
+ super(appInfo);
+ DexItemFactory factory = appInfo.dexItemFactory;
+ this.methodsOnMessageType = computeMethodsOnMessageType();
+ this.caseGetterSuffix = factory.createString("Case");
+ this.caseFieldSuffix = factory.createString("Case_");
+ }
+
+ private Set<Wrapper<DexMethod>> computeMethodsOnMessageType() {
+ DexClass messageClass = appInfo.definitionFor(messageType);
+ if (messageClass == null) {
+ return Collections.emptySet();
+ }
+ Set<Wrapper<DexMethod>> superMethods = new HashSet<>();
+ messageClass.forEachMethod(method -> superMethods.add(equivalence.wrap(method.method)));
+ return superMethods;
+ }
+
+ boolean isSetterThatNeedsProcessing(DexEncodedMethod method) {
+ return method.accessFlags.isPrivate()
+ && method.method.name.beginsWith(setterNamePrefix)
+ && !methodsOnMessageType.contains(equivalence.wrap(method.method));
+ }
+
+ private boolean isGetter(DexMethod method, DexType instanceType) {
+ return method.holder == instanceType
+ && (method.proto.parameters.isEmpty() || hasSingleIntArgument(method))
+ && method.name.beginsWith(getterNamePrefix)
+ && !method.name.endsWith(caseGetterSuffix)
+ && !methodsOnMessageType.contains(equivalence.wrap(method));
+ }
+
+ private boolean isProtoField(DexField field, DexType instanceType) {
+ if (field.getHolder() != instanceType) {
+ return false;
+ }
+ // All instance fields that end with _ are proto fields. For proto2, there are also the
+ // bitField<n>_ fields that are used to store presence information. We process those normally.
+ // Likewise, the XXXCase_ fields for oneOfs.
+ DexString name = field.name;
+ return name.endsWith(underscore)
+ && !name.beginsWith(bitFieldPrefix)
+ && !name.endsWith(caseFieldSuffix);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Object processMethod(DexEncodedMethod method, UseRegistry registry, Object state) {
+ return processMethod(method, registry, (Set<DexField>) state);
+ }
+
+ private Set<DexField> processMethod(DexEncodedMethod method, UseRegistry registry,
+ Set<DexField> state) {
+ if (state == null) {
+ state = Sets.newIdentityHashSet();
+ }
+ if (isSetterThatNeedsProcessing(method)) {
+ // If a field is accessed by a live setter, the field is live as it has to be written to the
+ // serialized stream for this proto. As we mask all reads in the writing code and normally
+ // remove fields that are only written but never read, we have to mark fields used in setters
+ // as read and written.
+ method.registerReachableDefinitions(
+ new FieldWriteImpliesReadUseRegistry(registry, method.method.holder));
+ } else {
+ // Filter all getters and field accesses in these methods. We do not want fields to become
+ // live just due to being referenced in a special method. The pruning phase will remove
+ // all references to dead fields in the code later.
+ method.registerReachableDefinitions(new FilteringUseRegistry(registry, method.method.holder,
+ state));
+ }
+ return state;
+ }
+
+ private class FieldWriteImpliesReadUseRegistry extends DelegatingUseRegistry {
+
+ private final DexType instanceType;
+
+ FieldWriteImpliesReadUseRegistry(UseRegistry delegate,
+ DexType instanceType) {
+ super(delegate);
+ this.instanceType = instanceType;
+ }
+
+ @Override
+ public boolean registerInstanceFieldWrite(DexField field) {
+ if (isProtoField(field, instanceType)) {
+ super.registerInstanceFieldRead(field);
+ }
+ return super.registerInstanceFieldWrite(field);
+ }
+ }
+
+ private class FilteringUseRegistry extends DelegatingUseRegistry {
+
+ private final DexType instanceType;
+ private final Set<DexField> registerField;
+
+ private FilteringUseRegistry(UseRegistry delegate,
+ DexType instanceType, Set<DexField> registerField) {
+ super(delegate);
+ this.instanceType = instanceType;
+ this.registerField = registerField;
+ }
+
+ @Override
+ public boolean registerInstanceFieldWrite(DexField field) {
+ if (isProtoField(field, instanceType)) {
+ registerField.add(field);
+ return false;
+ }
+ return super.registerInstanceFieldWrite(field);
+ }
+
+ @Override
+ public boolean registerInstanceFieldRead(DexField field) {
+ if (isProtoField(field, instanceType)) {
+ registerField.add(field);
+ return false;
+ }
+ return super.registerInstanceFieldRead(field);
+ }
+
+ @Override
+ public boolean registerInvokeVirtual(DexMethod method) {
+ if (isGetter(method, instanceType)) {
+ // Try whether this is a getXXX method.
+ DexField field = getterToField(method);
+ if (isProtoField(field, instanceType)) {
+ registerField.add(field);
+ return false;
+ }
+ // Try whether this is a getXXXCount method.
+ field = getterToField(method, COUNT_POSTFIX_LENGTH);
+ if (isProtoField(field, instanceType)) {
+ registerField.add(field);
+ return false;
+ }
+ }
+ return super.registerInvokeVirtual(method);
+ }
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLitePruner.java b/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLitePruner.java
new file mode 100644
index 0000000..4610f41
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/shaking/protolite/ProtoLitePruner.java
@@ -0,0 +1,739 @@
+// Copyright (c) 2017, 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.protolite;
+
+import com.android.tools.r8.errors.CompilationError;
+import com.android.tools.r8.errors.Unreachable;
+import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexField;
+import com.android.tools.r8.graph.DexItemFactory;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.DexString;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.ir.code.BasicBlock;
+import com.android.tools.r8.ir.code.DominatorTree;
+import com.android.tools.r8.ir.code.IRCode;
+import com.android.tools.r8.ir.code.InstanceGet;
+import com.android.tools.r8.ir.code.InstancePut;
+import com.android.tools.r8.ir.code.Instruction;
+import com.android.tools.r8.ir.code.InstructionIterator;
+import com.android.tools.r8.ir.code.InstructionListIterator;
+import com.android.tools.r8.ir.code.InvokeInterface;
+import com.android.tools.r8.ir.code.InvokeMethod;
+import com.android.tools.r8.ir.code.InvokeMethodWithReceiver;
+import com.android.tools.r8.ir.code.InvokeStatic;
+import com.android.tools.r8.ir.code.MemberType;
+import com.android.tools.r8.ir.code.MoveType;
+import com.android.tools.r8.ir.code.Switch;
+import com.android.tools.r8.ir.code.Value;
+import com.android.tools.r8.ir.optimize.SwitchUtils;
+import com.android.tools.r8.ir.optimize.SwitchUtils.EnumSwitchInfo;
+import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiPredicate;
+
+/**
+ * Implements the second phase of proto lite tree shaking.
+ * <p>
+ * In the pruner pass, we remove all references to the now dead fields from the methods that
+ * were treated specially during tree shaking using the {@link ProtoLiteExtension}.
+ * <p>
+ * For proto2 code, we aim to keep presence information for fields alive and move the values of
+ * dead fields to the unknown fields storage. For proto3, as it has no concept of passing on
+ * unknown fields, dead fields are completely removed. In particular, reading a proto and writing
+ * it again might loose data.
+ */
+public class ProtoLitePruner extends ProtoLiteBase {
+
+ private final AppInfoWithLiveness appInfo;
+
+ private final DexType visitorType;
+
+ private final DexType methodEnumType;
+ private final DexType codedOutputStreamType;
+ private final DexType protobufListType;
+ private final DexType listType;
+
+ private final DexString visitTag;
+ private final DexString mergeTag;
+ private final DexString isInitializedTag;
+ private final DexString makeImmutabkeTag;
+ private final DexString computeMethodPrefix;
+ private final DexString writeMethodPrefix;
+ private final DexString isInitializedMethodName;
+
+ private final DexString makeImmutableMethodName;
+ private final DexString sizeMethodName;
+ private final Set<DexField> seenFields;
+ private final DexMethod sizeMethod;
+
+ public ProtoLitePruner(AppInfoWithLiveness appInfo) {
+ super(appInfo);
+ this.appInfo = appInfo;
+ DexItemFactory factory = appInfo.dexItemFactory;
+ this.visitorType = factory.createType("Lcom/google/protobuf/GeneratedMessageLite$Visitor;");
+ this.methodEnumType = factory
+ .createType("Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;");
+ this.codedOutputStreamType = factory.createType("Lcom/google/protobuf/CodedOutputStream;");
+ this.protobufListType = factory.createType("Lcom/google/protobuf/Internal$ProtobufList;");
+ this.listType = factory.createType("Ljava/util/List;");
+ this.visitTag = factory.createString("VISIT");
+ this.mergeTag = factory.createString("MERGE_FROM_STREAM");
+ this.isInitializedTag = factory.createString("IS_INITIALIZED");
+ this.makeImmutabkeTag = factory.createString("MAKE_IMMUTABLE");
+ this.computeMethodPrefix = factory.createString("compute");
+ this.writeMethodPrefix = factory.createString("write");
+ this.sizeMethodName = factory.createString("size");
+ this.isInitializedMethodName = factory.createString("isInitialized");
+ this.makeImmutableMethodName = factory.createString("makeImmutable");
+ this.sizeMethod = factory.createMethod(listType,
+ factory.createProto(factory.intType), sizeMethodName);
+
+ seenFields = appInfo.withLiveness()
+ .getExtension(ProtoLiteExtension.class, Collections.emptySet());
+ }
+
+ private boolean isPresenceField(DexField field, DexType instanceType) {
+ if (field.getHolder() != instanceType) {
+ return false;
+ }
+ // Proto2 uses fields named bitField<n>_ fields to store presence information.
+ String fieldName = field.name.toString();
+ return fieldName.endsWith("_")
+ && fieldName.startsWith("bitField");
+ }
+
+ boolean isSetterThatNeedsProcessing(DexEncodedMethod method) {
+ // The pruner does not need to process setters, so this method always returns false.
+ return false;
+ }
+
+ private boolean isGetter(DexMethod method) {
+ return isGetterHelper(method, 0);
+ }
+
+ private boolean isCountGetter(DexMethod method) {
+ return isGetterHelper(method, COUNT_POSTFIX_LENGTH);
+ }
+
+ private boolean isGetterHelper(DexMethod method, int postFixLength) {
+ if (!method.name.beginsWith(getterNamePrefix)
+ || !(method.proto.parameters.isEmpty() || hasSingleIntArgument(method))
+ || (method.holder == messageType)
+ || !method.holder.isSubtypeOf(messageType, appInfo)
+ || method.name.size <= GETTER_NAME_PREFIX_LENGTH + postFixLength) {
+ return false;
+ }
+ DexField correspondingField = getterToField(method, postFixLength);
+ return seenFields.contains(correspondingField);
+ }
+
+ private boolean isDefinedAsNull(Value value) {
+ return value.definition != null && value.definition.isConstNumber()
+ && value.definition.asConstNumber().isZero();
+ }
+
+ private boolean isComputeSizeMethod(DexMethod invokedMethod) {
+ return invokedMethod.holder == codedOutputStreamType
+ && invokedMethod.name.beginsWith(computeMethodPrefix);
+ }
+
+ private boolean isWriteMethod(DexMethod invokedMethod) {
+ return invokedMethod.holder == codedOutputStreamType
+ && invokedMethod.name.beginsWith(writeMethodPrefix);
+ }
+
+ private boolean isProtoField(DexField field) {
+ return seenFields.contains(field);
+ }
+
+ public void rewriteProtoLiteSpecialMethod(IRCode code, DexEncodedMethod method) {
+ DexString methodName = method.method.name;
+ if (methodName == dynamicMethodName) {
+ rewriteDynamicMethod(code, method);
+ } else if ((methodName == writeToMethodName) || (methodName == getSerializedSizeMethodName)) {
+ rewriteSizeOrWriteMethod(code);
+ } else if (methodName == constructorMethodName) {
+ rewriteConstructor(code);
+ } else {
+ throw new Unreachable();
+ }
+ }
+
+ /**
+ * For protos with repeated fields, the constructor may contain field initialization code like
+ *
+ * <pre>
+ * private Repeated() {
+ * repeated_ = com.google.protobuf.GeneratedMessageLite.emptyProtobufList();
+ * other_ = emptyBooleanList();
+ * sub_ = emptyProtobufList();
+ * }
+ * </pre>
+ *
+ * which this rewriting removes.
+ */
+ private void rewriteConstructor(IRCode code) {
+ boolean wasRewritten;
+ do {
+ wasRewritten = false;
+ InstructionIterator it = code.instructionIterator();
+ while (it.hasNext()) {
+ Instruction insn = it.next();
+ if (insn.isInstancePut() && isDeadProtoField(insn.asInstancePut().getField())) {
+ // Remove initializations of dead fields.
+ it.remove();
+ wasRewritten = true;
+ } else if (insn.isInvokeStatic()) {
+ // Remove now unneeded constructor calls.
+ InvokeStatic invokeStatic = insn.asInvokeStatic();
+ DexMethod invokedMethod = invokeStatic.getInvokedMethod();
+ if ((!invokeStatic.outValue().isUsed())
+ && invokedMethod.proto.returnType.isSubtypeOf(protobufListType, appInfo)) {
+ it.remove();
+ }
+ }
+ }
+ } while (wasRewritten);
+ }
+
+
+ /**
+ * The writeTo and getSerializedSize methods of a generated proto access all fields. We have to
+ * remove the accesses to dead fields. The actual code of these methods varies to quite some
+ * degree depending on the types of the fields. For example
+ *
+ * <pre>
+ * public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+ * if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ * output.writeInt32(1, id_);
+ * }
+ * if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ * output.writeMessage(2, getInner());
+ * }
+ * for (int i = 0; i < repeated_.size(); i++) {
+ * output.writeString(3, repeated_.get(i));
+ * }
+ * for (int i = 0; i < other_.size(); i++) {
+ * output.writeBool(4, other_.getBoolean(i));
+ * }
+ * for (int i = 0; i < sub_.size(); i++) {
+ * output.writeMessage(5, sub_.get(i));
+ * }
+ * unknownFields.writeTo(output);
+ * }
+ * </pre>
+ *
+ * We look for direct field accesses (id_, repeated_, etc. above) and getters (getInner) and
+ * rewrite those to null/0. We also rewrite all uses of the results, like the size() and
+ * write methods above.
+ */
+ private void rewriteSizeOrWriteMethod(IRCode code) {
+ boolean wasRewritten;
+ do {
+ wasRewritten = false;
+ InstructionIterator it = code.instructionIterator();
+ while (it.hasNext()) {
+ Instruction insn = it.next();
+ if (insn.isInstanceGet()) {
+ DexField field = insn.asInstanceGet().getField();
+ if (isDeadProtoField(field)) {
+ // Rewrite deads field access to corresponding 0.
+ it.replaceCurrentInstruction(code.createConstNull(insn.asInstanceGet()));
+ wasRewritten = true;
+ }
+ } else if (insn.isInvokeMethodWithReceiver()) {
+ InvokeMethodWithReceiver invokeMethod = insn.asInvokeMethodWithReceiver();
+ DexMethod invokedMethod = invokeMethod.getInvokedMethod();
+ if (isDeadProtoGetter(invokedMethod)) {
+ // Rewrite dead getters.
+ it.replaceCurrentInstruction(code.createConstNull(invokeMethod));
+ wasRewritten = true;
+ } else if (invokedMethod.name == sizeMethodName
+ && invokedMethod.holder.isSubtypeOf(listType, appInfo)) {
+ Value receiver = invokeMethod.getReceiver();
+ if (isDefinedAsNull(receiver)) {
+ // Rewrite size() methods with null receiver.
+ it.replaceCurrentInstruction(code.createConstNull(invokeMethod));
+ }
+ } else if (invokedMethod.name == getterNamePrefix
+ && invokedMethod.holder.isSubtypeOf(listType, appInfo)) {
+ Value receiver = invokeMethod.getReceiver();
+ if (isDefinedAsNull(receiver)) {
+ // Rewrite get(x) methods with null receiver.
+ it.replaceCurrentInstruction(code.createConstNull(invokeMethod));
+ wasRewritten = true;
+ }
+ } else if (isWriteMethod(invokedMethod)) {
+ Value lastArg = Iterables.getLast(invokeMethod.inValues());
+ if (isDefinedAsNull(lastArg)) {
+ it.remove();
+ }
+ }
+ } else if (insn.isInvokeMethod()) {
+ InvokeMethod invokeMethod = insn.asInvokeMethod();
+ DexMethod invokedMethod = invokeMethod.getInvokedMethod();
+ if (isComputeSizeMethod(invokedMethod)) {
+ Value lastArg = Iterables.getLast(invokeMethod.inValues());
+ if (isDefinedAsNull(lastArg)) {
+ // This is a computeSize method on a constant null. The field was dead.
+ assert (invokeMethod.outValue() != null);
+ it.replaceCurrentInstruction(code.createConstNull(invokeMethod));
+ wasRewritten = true;
+ }
+ }
+ }
+ }
+ } while (wasRewritten);
+ }
+
+ /**
+ * The dyanmicMethod code is actually a collection of various methods contained in one.
+ * It uses a switch statement over an enum to identify which actual operation is performed.
+ * We need to rewrite all cases that might access dead fields. These are
+ * <dl>
+ * <dt>IS_INITIALIZED</dt>
+ * <dd>See {@link #rewriteIsInitializedCase}.</dd>
+ * <dt>MAKE_IMMUTABLE</dt>
+ * <dd>See {@link #rewriteMakeImmutableCase}.</dd>
+ * <dt>VISIT</dt>
+ * <dd>See {@link #rewriteVisitCase}.</dd>
+ * <dt>MERGE_FROM_STREAM</dt>
+ * <dd>See {@link #rewriteMergeCase}.</dd>
+ * </dl>
+ */
+ private void rewriteDynamicMethod(IRCode code, DexEncodedMethod method) {
+ // This method contains a switch and we are interested in some of the cases only.
+ InstructionIterator iterator = code.instructionIterator();
+ Instruction matchingInstr = iterator.nextUntil(Instruction::isSwitch);
+ if (matchingInstr == null) {
+ throw new CompilationError("dynamicMethod in protoLite without switch.");
+ }
+ Switch switchInstr = matchingInstr.asSwitch();
+ EnumSwitchInfo info = SwitchUtils.analyzeSwitchOverEnum(switchInstr, appInfo);
+ if (info == null || info.enumClass != methodEnumType) {
+ throw new CompilationError("Malformed switch in dynamicMethod of proto lite.");
+ }
+ BasicBlock initializedCase = null;
+ BasicBlock visitCase = null;
+ BasicBlock mergeCase = null;
+ BasicBlock makeImmutableCase = null;
+ for (int keyIdx = 0; keyIdx < switchInstr.numberOfKeys(); keyIdx++) {
+ int key = switchInstr.getKey(keyIdx);
+ DexField label = info.indexMap.get(key);
+ assert label != null;
+ if (label.name == visitTag) {
+ assert visitCase == null;
+ visitCase = switchInstr.targetBlock(keyIdx);
+ } else if (label.name == mergeTag) {
+ assert mergeCase == null;
+ mergeCase = switchInstr.targetBlock(keyIdx);
+ } else if (label.name == isInitializedTag) {
+ assert initializedCase == null;
+ initializedCase = switchInstr.targetBlock(keyIdx);
+ } else if (label.name == makeImmutabkeTag) {
+ assert makeImmutableCase == null;
+ makeImmutableCase = switchInstr.targetBlock(keyIdx);
+ }
+ }
+ DexType instanceType = method.method.getHolder();
+ rewriteIsInitializedCase(initializedCase, instanceType, code);
+ assert code.isConsistentSSA();
+ rewriteMakeImmutableCase(makeImmutableCase, code);
+ assert code.isConsistentSSA();
+ rewriteVisitCase(visitCase, code);
+ assert code.isConsistentSSA();
+ rewriteMergeCase(mergeCase, instanceType, code);
+ assert code.isConsistentSSA();
+ }
+
+ /**
+ * In the presence of repeated fields, the MAKE_IMMUTABLE case will contain code of the form
+ *
+ * <pre>
+ * case MAKE_IMMUTABLE: {
+ * repeated_.makeImmutable();
+ * other_.makeImmutable();
+ * sub_.makeImmutable();
+ * return null;
+ * }
+ * </pre>
+ *
+ * For dead fields, we remove the field access and the call to makeImmutable.
+ */
+ private void rewriteMakeImmutableCase(BasicBlock switchCase, IRCode code) {
+ DominatorTree dom = new DominatorTree(code);
+ boolean wasRewritten;
+ do {
+ wasRewritten = false;
+ for (BasicBlock current : dom.dominatedBlocks(switchCase)) {
+ InstructionIterator it = current.iterator();
+ while (it.hasNext()) {
+ Instruction insn = it.next();
+ if (insn.isInstanceGet() && isDeadProtoField(insn.asInstanceGet().getField())) {
+ it.replaceCurrentInstruction(code.createConstNull(insn));
+ wasRewritten = true;
+ } else if (insn.isInvokeMethodWithReceiver()) {
+ InvokeMethodWithReceiver invokeMethod = insn.asInvokeMethodWithReceiver();
+ DexMethod invokedMethod = invokeMethod.getInvokedMethod();
+ if (isDeadProtoGetter(invokedMethod)) {
+ it.replaceCurrentInstruction(code.createConstNull(invokeMethod));
+ wasRewritten = true;
+ } else if (invokedMethod.name == makeImmutableMethodName
+ && invokedMethod.getHolder().isSubtypeOf(protobufListType, appInfo)) {
+ Value receiver = invokeMethod.getReceiver();
+ if (isDefinedAsNull(receiver)) {
+ it.remove();
+ }
+ }
+ }
+ }
+ }
+ } while (wasRewritten);
+ }
+
+ /**
+ * The IS_INITIALIZED case also has a high degree of variability depending on the type of fields.
+ * Common code looks as follows
+ *
+ * <pre>
+ * case IS_INITIALIZED: {
+ * byte isInitialized = memoizedIsInitialized;
+ * if (isInitialized == 1) return DEFAULT_INSTANCE;
+ * if (isInitialized == 0) return null;
+ *
+ * boolean shouldMemoize = ((Boolean) arg0).booleanValue();
+ * if (!hasId()) {
+ * if (shouldMemoize) {
+ * memoizedIsInitialized = 0;
+ * }
+ * return null;
+ * }
+ * for (int i = 0; i < getSubCount(); i++) {
+ * if (!getSub(i).isInitialized()) {
+ * if (shouldMemoize) {
+ * memoizedIsInitialized = 0;
+ * }
+ * return null;
+ * }
+ * }
+ * if (shouldMemoize) memoizedIsInitialized = 1;
+ * return DEFAULT_INSTANCE;
+ * }
+ * </pre>
+ *
+ * We remove all the accesses of dead fields and getters. We also replace secondary invokes
+ * (like getSubCount or isInitialized) with conservative default values (e.g. 0, true).
+ * <p>
+ * We also rewrite getXXXCount methods on live fields, as accesses to those methods was filtered
+ * during tree shaking. In place of those methods, we inline their definition.
+ */
+ private void rewriteIsInitializedCase(BasicBlock switchCase, DexType instanceType,
+ IRCode code) {
+ DominatorTree dom = new DominatorTree(code);
+ boolean wasRewritten;
+ do {
+ wasRewritten = false;
+ for (BasicBlock current : dom.dominatedBlocks(switchCase)) {
+ InstructionIterator it = current.iterator();
+ while (it.hasNext()) {
+ Instruction insn = it.next();
+ if (insn.isInvokeMethodWithReceiver()) {
+ InvokeMethodWithReceiver invokeMethod = insn.asInvokeMethodWithReceiver();
+ DexMethod invokedMethod = invokeMethod.getInvokedMethod();
+ if (isDeadProtoGetter(invokedMethod)) {
+ it.replaceCurrentInstruction(code.createConstNull(invokeMethod));
+ wasRewritten = true;
+ } else if (invokedMethod.name == isInitializedMethodName
+ && invokedMethod.getHolder().isSubtypeOf(messageType, appInfo)) {
+ Value receiver = invokeMethod.getReceiver();
+ if (isDefinedAsNull(receiver)) {
+ // We cannot compute initialization state for nested messages and repeated
+ // messages that have been removed or moved to unknown fields. Just return
+ // true.
+ it.replaceCurrentInstruction(code.createTrue());
+ wasRewritten = true;
+ }
+ } else if (isCountGetter(invokedMethod)) {
+ // We have to rewrite these as a precaution, as they might be dead due to
+ // tree shaking ignoring them.
+ DexField field = getterToField(invokedMethod, 5);
+ if (appInfo.liveFields.contains(field)) {
+ // Effectively inline the code that is normally inside these methods.
+ Value thisReference = invokeMethod.getReceiver();
+ Value newResult = code.createValue(MoveType.SINGLE);
+ invokeMethod.outValue().replaceUsers(newResult);
+ Value theList = code.createValue(MoveType.OBJECT);
+ it.replaceCurrentInstruction(
+ new InstanceGet(MemberType.OBJECT, theList, thisReference, field));
+ it.add(new InvokeInterface(sizeMethod, newResult, Collections.emptyList()));
+ } else {
+ // The field is dead, so its count is always 0.
+ it.replaceCurrentInstruction(code.createConstNull(invokeMethod));
+ }
+ }
+ }
+ }
+ }
+ } while (wasRewritten);
+ }
+
+ private InstancePut findProtoFieldWrite(BasicBlock block, DexType instanceType,
+ BiPredicate<DexField, DexType> filter, DominatorTree dom) {
+ for (BasicBlock current : dom.dominatedBlocks(block)) {
+ InstructionIterator insns = current.iterator();
+ InstancePut instancePut = (InstancePut) insns.nextUntil(Instruction::isInstancePut);
+ if (instancePut != null && filter.test(instancePut.getField(), instanceType)) {
+ return instancePut;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * For the merge case, we typically see code that contains a switch over the field tags. The inner
+ * switch has the form
+ *
+ * <pre>
+ * switch (tag) {
+ * case 0:
+ * done = true;
+ * break;
+ * default: {
+ * if (!parseUnknownField(tag, input)) {
+ * done = true;
+ * }
+ * break;
+ * }
+ * case 8: {
+ * bitField0_ |= 0x00000001;
+ * id_ = input.readInt32();
+ * break;
+ * }
+ * case 18: {
+ * nestedproto2.GeneratedNestedProto.NestedOne.Builder subBuilder = null;
+ * if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ * subBuilder = inner_.toBuilder();
+ * }
+ * inner_ = input.readMessage(nestedproto2.GeneratedNestedProto.NestedOne.parser(),
+ * extensionRegistry);
+ * if (subBuilder != null) {
+ * subBuilder.mergeFrom(inner_);
+ * inner_ = subBuilder.buildPartial();
+ * }
+ * bitField0_ |= 0x00000002;
+ * break;
+ * }
+ * case 24: {
+ * if (!other_.isModifiable()) {
+ * other_ =
+ * com.google.protobuf.GeneratedMessageLite.mutableCopy(other_);
+ * }
+ * other_.addBoolean(input.readBool());
+ * break;
+ * }
+ * case 26: {
+ * int length = input.readRawVarint32();
+ * int limit = input.pushLimit(length);
+ * if (!other_.isModifiable() && input.getBytesUntilLimit() > 0) {
+ * final int currentSize = other_.size();
+ * other_ = other_.mutableCopyWithCapacity(
+ * currentSize + (length/1));
+ * }
+ * while (input.getBytesUntilLimit() > 0) {
+ * other_.addBoolean(input.readBool());
+ * }
+ * input.popLimit(limit);
+ * break;
+ * }
+ * }
+ * </pre>
+ *
+ * The general approach here is to identify the field that is processed by a case and, if
+ * the field is dead, remove the entire case.
+ * <p>
+ * We slightly complicate the rewriting by also checking whether the block computes a
+ * presence bitfield (bitField0_ above). If so, we move that computation to a new block that
+ * continues to the default case. This ensures that presence is recorded correctly, yet the
+ * field is moved to the unknownFields collection, if such exists.
+ */
+ private void rewriteMergeCase(BasicBlock caseBlock, DexType instanceType,
+ IRCode code) {
+ // We are looking for a switch statement over the input tag. Just traverse all blocks until
+ // we find it.
+ List<BasicBlock> deadBlocks = new ArrayList<>();
+ DominatorTree dom = new DominatorTree(code);
+ for (BasicBlock current : dom.dominatedBlocks(caseBlock)) {
+ InstructionIterator it = current.iterator();
+ Switch switchInstr;
+ if ((switchInstr = (Switch) it.nextUntil(Instruction::isSwitch)) != null) {
+ int nextBlock = code.getHighestBlockNumber() + 1;
+ IntList liveKeys = new IntArrayList(switchInstr.numberOfKeys());
+ List<BasicBlock> liveBlocks = new ArrayList<>(switchInstr.numberOfKeys());
+ boolean needsCleanup = false;
+ // Filter out all the cases that contain writes to dead fields.
+ for (int keyIdx = 0; keyIdx < switchInstr.numberOfKeys(); keyIdx++) {
+ BasicBlock targetBlock = switchInstr.targetBlock(keyIdx);
+ InstancePut instancePut =
+ findProtoFieldWrite(targetBlock, instanceType, (field, holder) -> isProtoField(field),
+ dom);
+ if (instancePut == null
+ || appInfo.withLiveness().liveFields.contains(instancePut.getField())) {
+ // This is a live case. Keep it.
+ liveKeys.add(switchInstr.getKey(keyIdx));
+ liveBlocks.add(targetBlock);
+ } else {
+ // We cannot just remove this entire switch case if there is some computation here
+ // for whether the field is present. We check this by searching for a write to
+ // the bitField<xxx>_ fields. If such write exists, we move the corresponding
+ // instructions to the first block in the switch.
+ //TODO(herhut): Only do this if the written field has a live hasMethod.
+ InstancePut bitFieldUpdate = findProtoFieldWrite(targetBlock, instanceType,
+ this::isPresenceField, dom);
+ if (bitFieldUpdate != null) {
+ BasicBlock newBlock = BasicBlock.createGotoBlock(nextBlock++);
+ newBlock.link(switchInstr.fallthroughBlock());
+ // Copy over the computation of the field;
+ moveInstructionTo(newBlock.listIterator(), bitFieldUpdate, dom, targetBlock);
+ switchInstr.getBlock().link(newBlock);
+ liveKeys.add(switchInstr.getKey(keyIdx));
+ liveBlocks.add(newBlock);
+ code.blocks.add(newBlock);
+ }
+ needsCleanup = true;
+ }
+ }
+ if (needsCleanup) {
+ DominatorTree updatedTree = new DominatorTree(code);
+ BasicBlock fallThrough = switchInstr.fallthroughBlock();
+ List<BasicBlock> successors = ImmutableList.copyOf(current.getNormalSucessors());
+ for (BasicBlock successor : successors) {
+ if (successor != fallThrough && !liveBlocks.contains(successor)) {
+ deadBlocks.addAll(current.unlink(successor, updatedTree));
+ }
+ }
+ int[] blockIndices = new int[liveBlocks.size()];
+ for (int i = 0; i < liveBlocks.size(); i++) {
+ blockIndices[i] = current.getSuccessors().indexOf(liveBlocks.get(i));
+ }
+ Switch newSwitch = new Switch(switchInstr.inValues().get(0), liveKeys.toIntArray(),
+ blockIndices, current.getSuccessors().indexOf(fallThrough));
+ it.replaceCurrentInstruction(newSwitch);
+ }
+ break;
+ }
+ }
+ code.removeBlocks(deadBlocks);
+ }
+
+ //TODO(herhut): This should really be a copy with a value substitution map.
+ private void moveInstructionTo(InstructionListIterator iterator, Instruction insn,
+ DominatorTree dom,
+ BasicBlock dominator) {
+ for (Value value : insn.inValues()) {
+ Instruction input = value.definition;
+ // We do not support phis.
+ assert input != null;
+ if (dom.dominatedBy(input.getBlock(), dominator)) {
+ // And no shared instructions.
+ assert input.outValue().numberOfUsers() == 1;
+ moveInstructionTo(iterator, input, dom, dominator);
+ }
+ }
+ insn.getBlock().removeInstruction(insn);
+ iterator.add(insn);
+ }
+
+ private boolean isDeadProtoField(DexField field) {
+ return isProtoField(field) && !appInfo.liveFields.contains(field);
+ }
+
+ private boolean isDeadProtoGetter(DexMethod method) {
+ return isGetter(method) && isDeadProtoField(getterToField(method));
+ }
+
+ private boolean isVisitOfDeadField(Instruction instruction) {
+ if (!instruction.isInvokeMethod()) {
+ return false;
+ }
+ InvokeMethod invokeMethod = instruction.asInvokeMethod();
+ if (invokeMethod.getInvokedMethod().getHolder() == visitorType
+ && invokeMethod.getInvokedMethod().getArity() >= 2) {
+ Instruction secondArg = invokeMethod.inValues().get(2).definition;
+ return secondArg.isConstNumber();
+ }
+ return false;
+ }
+
+ /**
+ * The visit case has typically the form
+ *
+ * <pre>
+ * case VISIT: {
+ * Visitor visitor = (Visitor) arg0;
+ * repeatedproto.GeneratedRepeatedProto.Repeated other =
+ * (repeatedproto.GeneratedRepeatedProto.Repeated) arg1;
+ * id_ = visitor.visitInt(
+ * hasId(), id_,
+ * other.hasId(), other.id_);
+ * repeated_= visitor.visitList(repeated_, other.repeated_);
+ * inner_ = visitor.visitMessage(inner_, other.inner_);
+ * if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor.INSTANCE) {
+ * bitField0_ |= other.bitField0_;
+ * }
+ * return this;
+ * }
+ * </pre>
+ *
+ * We remove all writes and reads to dead fields and correspondign secondary instructions, like
+ * the visitXXX methods.
+ * <p>
+ * Note that the invoked hasMethods are benign, as the only access the bitFieldXXX_ fields, which
+ * we currently do not remove. Inlining will likely remove the methods.
+ */
+ private void rewriteVisitCase(BasicBlock switchCase, IRCode code) {
+ DominatorTree dom = new DominatorTree(code);
+ boolean wasRewritten;
+ do {
+ wasRewritten = false;
+ for (BasicBlock target : dom.dominatedBlocks(switchCase)) {
+ InstructionIterator it = target.iterator();
+ while (it.hasNext()) {
+ Instruction insn = it.next();
+ if (insn.isInstanceGet()) {
+ InstanceGet instanceGet = insn.asInstanceGet();
+ if (isDeadProtoField(instanceGet.getField())) {
+ it.replaceCurrentInstruction(code.createConstNull(instanceGet));
+ wasRewritten = true;
+ }
+ } else if (insn.isInstancePut()) {
+ if (isDeadProtoField(insn.asInstancePut().getField())) {
+ it.remove();
+ }
+ } else if (isVisitOfDeadField(insn)) {
+ it.replaceCurrentInstruction(code.createConstNull(insn));
+ } else if (insn.isCheckCast()) {
+ // The call to visitXXX is a generic method invoke, so it will be followed by a check
+ // cast to fix up the type. As the result is no longer needed once we are done, we can
+ // remove the cast. This removes a potential last reference to an inner message class.
+ // TODO(herhut): We should have a generic dead cast removal.
+ Value inValue = insn.inValues().get(0);
+ if (isDefinedAsNull(inValue)) {
+ insn.outValue().replaceUsers(inValue);
+ it.remove();
+ }
+ }
+
+ }
+ }
+ } while (wasRewritten);
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/utils/AndroidApp.java b/src/main/java/com/android/tools/r8/utils/AndroidApp.java
index e767030..a297c10 100644
--- a/src/main/java/com/android/tools/r8/utils/AndroidApp.java
+++ b/src/main/java/com/android/tools/r8/utils/AndroidApp.java
@@ -15,7 +15,6 @@
import com.google.common.io.Closer;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -25,19 +24,15 @@
import java.nio.file.Files;
import java.nio.file.OpenOption;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
/**
@@ -52,30 +47,39 @@
private final ImmutableList<Resource> programResources;
private final ImmutableList<ClassFileResourceProvider> classpathResourceProviders;
private final ImmutableList<ClassFileResourceProvider> libraryResourceProviders;
+ private final ImmutableList<ProgramFileArchiveReader> programFileArchiveReaders;
private final Resource deadCode;
private final Resource proguardMap;
private final Resource proguardSeeds;
private final Resource packageDistribution;
- private final Resource mainDexList;
+ private final List<Resource> mainDexListResources;
+ private final List<String> mainDexClasses;
+ private final Resource mainDexListOutput;
// See factory methods and AndroidApp.Builder below.
private AndroidApp(
ImmutableList<Resource> programResources,
+ ImmutableList<ProgramFileArchiveReader> programFileArchiveReaders,
ImmutableList<ClassFileResourceProvider> classpathResourceProviders,
ImmutableList<ClassFileResourceProvider> libraryResourceProviders,
Resource deadCode,
Resource proguardMap,
Resource proguardSeeds,
Resource packageDistribution,
- Resource mainDexList) {
+ List<Resource> mainDexListResources,
+ List<String> mainDexClasses,
+ Resource mainDexListOutput) {
this.programResources = programResources;
+ this.programFileArchiveReaders = programFileArchiveReaders;
this.classpathResourceProviders = classpathResourceProviders;
this.libraryResourceProviders = libraryResourceProviders;
this.deadCode = deadCode;
this.proguardMap = proguardMap;
this.proguardSeeds = proguardSeeds;
this.packageDistribution = packageDistribution;
- this.mainDexList = mainDexList;
+ this.mainDexListResources = mainDexListResources;
+ this.mainDexClasses = mainDexClasses;
+ this.mainDexListOutput = mainDexListOutput;
}
/**
@@ -142,13 +146,26 @@
}
/** Get input streams for all dex program resources. */
- public List<Resource> getDexProgramResources() {
+ public List<Resource> getDexProgramResources() throws IOException {
+ List<Resource> dexResources = filter(programResources, Resource.Kind.DEX);
+ for (ProgramFileArchiveReader reader : programFileArchiveReaders) {
+ dexResources.addAll(reader.getDexProgramResources());
+ }
+ return dexResources;
+ }
+
+ public List<Resource> getDexProgramResourcesForOutput() {
+ assert programFileArchiveReaders.isEmpty();
return filter(programResources, Resource.Kind.DEX);
}
/** Get input streams for all Java-bytecode program resources. */
- public List<Resource> getClassProgramResources() {
- return filter(programResources, Resource.Kind.CLASSFILE);
+ public List<Resource> getClassProgramResources() throws IOException {
+ List<Resource> classResources = filter(programResources, Resource.Kind.CLASSFILE);
+ for (ProgramFileArchiveReader reader : programFileArchiveReaders) {
+ classResources.addAll(reader.getClassProgramResources());
+ }
+ return classResources;
}
/** Get classpath resource providers. */
@@ -231,14 +248,35 @@
* True if the main dex list resource exists.
*/
public boolean hasMainDexList() {
- return mainDexList != null;
+ return !mainDexListResources.isEmpty();
}
/**
- * Get the input stream of the main dex list resource if it exists.
+ * Get the main dex list resources if any.
*/
- public InputStream getMainDexList(Closer closer) throws IOException {
- return mainDexList == null ? null : closer.register(mainDexList.getStream());
+ public List<Resource> getMainDexListResources() {
+ return mainDexListResources;
+ }
+
+ /**
+ * Get the main dex classes if any.
+ */
+ public List<String> getMainDexClasses() {
+ return mainDexClasses;
+ }
+
+ /**
+ * True if the main dex list resource exists.
+ */
+ public boolean hasMainDexListOutput() {
+ return mainDexListOutput != null;
+ }
+
+ /**
+ * Get the main dex list output resources if any.
+ */
+ public InputStream getMainDexListOutput(Closer closer) throws IOException {
+ return mainDexListOutput == null ? null : closer.register(mainDexListOutput.getStream());
}
/**
@@ -350,7 +388,7 @@
}
public void writeMainDexList(Closer closer, OutputStream out) throws IOException {
- InputStream input = getMainDexList(closer);
+ InputStream input = getMainDexListOutput(closer);
assert input != null;
out.write(ByteStreams.toByteArray(input));
}
@@ -367,13 +405,16 @@
public static class Builder {
private final List<Resource> programResources = new ArrayList<>();
+ private final List<ProgramFileArchiveReader> programFileArchiveReaders = new ArrayList<>();
private final List<ClassFileResourceProvider> classpathResourceProviders = new ArrayList<>();
private final List<ClassFileResourceProvider> libraryResourceProviders = new ArrayList<>();
private Resource deadCode;
private Resource proguardMap;
private Resource proguardSeeds;
private Resource packageDistribution;
- private Resource mainDexList;
+ private List<Resource> mainDexListResources = new ArrayList<>();
+ private List<String> mainDexListClasses = new ArrayList<>();
+ private Resource mainDexListOutput;
// See AndroidApp::builder().
private Builder() {
@@ -382,13 +423,16 @@
// See AndroidApp::builder(AndroidApp).
private Builder(AndroidApp app) {
programResources.addAll(app.programResources);
+ programFileArchiveReaders.addAll(app.programFileArchiveReaders);
classpathResourceProviders.addAll(app.classpathResourceProviders);
libraryResourceProviders.addAll(app.libraryResourceProviders);
deadCode = app.deadCode;
proguardMap = app.proguardMap;
proguardSeeds = app.proguardSeeds;
packageDistribution = app.packageDistribution;
- mainDexList = app.mainDexList;
+ mainDexListResources = app.mainDexListResources;
+ mainDexListClasses = app.mainDexClasses;
+ mainDexListOutput = app.mainDexListOutput;
}
/**
@@ -572,18 +616,49 @@
}
/**
- * Set the main-dex list file.
+ * Add a main-dex list file.
*/
- public Builder setMainDexListFile(Path file) {
- mainDexList = file == null ? null : Resource.fromFile(null, file);
+ public Builder addMainDexListFiles(Path... files) throws IOException {
+ return addMainDexListFiles(Arrays.asList(files));
+ }
+
+ public Builder addMainDexListFiles(Collection<Path> files) throws IOException {
+ for (Path file : files) {
+ if (!Files.exists(file)) {
+ throw new FileNotFoundException("Non-existent input file: " + file);
+ }
+ // TODO(sgjesse): Should we just read the file here? This will sacrifice the parallelism
+ // in ApplicationReader where all input resources are read in parallel.
+ mainDexListResources.add(Resource.fromFile(null, file));
+ }
return this;
}
+
/**
- * Set the main-dex list data.
+ * Add main-dex classes.
*/
- public Builder setMainDexListData(byte[] content) {
- mainDexList = content == null ? null : Resource.fromBytes(null, content);
+ public Builder addMainDexClasses(String... classes) {
+ return addMainDexClasses(Arrays.asList(classes));
+ }
+
+ /**
+ * Add main-dex classes.
+ */
+ public Builder addMainDexClasses(Collection<String> classes) {
+ mainDexListClasses.addAll(classes);
+ return this;
+ }
+
+ public boolean hasMainDexList() {
+ return !(mainDexListResources.isEmpty() && mainDexListClasses.isEmpty());
+ }
+
+ /**
+ * Set the main-dex list output data.
+ */
+ public Builder setMainDexListOutputData(byte[] content) {
+ mainDexListOutput = content == null ? null : Resource.fromBytes(null, content);
return this;
}
@@ -593,13 +668,16 @@
public AndroidApp build() {
return new AndroidApp(
ImmutableList.copyOf(programResources),
+ ImmutableList.copyOf(programFileArchiveReaders),
ImmutableList.copyOf(classpathResourceProviders),
ImmutableList.copyOf(libraryResourceProviders),
deadCode,
proguardMap,
proguardSeeds,
packageDistribution,
- mainDexList);
+ mainDexListResources,
+ mainDexListClasses,
+ mainDexListOutput);
}
private void addProgramFile(Path file) throws IOException {
@@ -611,7 +689,7 @@
} else if (isClassFile(file)) {
programResources.add(Resource.fromFile(Resource.Kind.CLASSFILE, file));
} else if (isArchive(file)) {
- addProgramArchive(file);
+ programFileArchiveReaders.add(new ProgramFileArchiveReader(file));
} else {
throw new CompilationError("Unsupported source file type for file: " + file);
}
@@ -630,35 +708,5 @@
throw new CompilationError("Unsupported source file type for file: " + file);
}
}
-
- private void addProgramArchive(Path archive) throws IOException {
- assert isArchive(archive);
- boolean containsDexData = false;
- boolean containsClassData = false;
- try (ZipInputStream stream = new ZipInputStream(new FileInputStream(archive.toFile()))) {
- ZipEntry entry;
- while ((entry = stream.getNextEntry()) != null) {
- Path name = Paths.get(entry.getName());
- if (isDexFile(name)) {
- containsDexData = true;
- programResources.add(Resource.fromBytes(
- Resource.Kind.DEX, ByteStreams.toByteArray(stream)));
- } else if (isClassFile(name)) {
- containsClassData = true;
- String descriptor = PreloadedClassFileProvider.guessTypeDescriptor(name);
- programResources.add(Resource.fromBytes(Resource.Kind.CLASSFILE,
- ByteStreams.toByteArray(stream), Collections.singleton(descriptor)));
- }
- }
- } catch (ZipException e) {
- throw new CompilationError(
- "Zip error while reading '" + archive + "': " + e.getMessage(), e);
- }
- if (containsDexData && containsClassData) {
- throw new CompilationError(
- "Cannot create android app from an archive '" + archive
- + "' containing both DEX and Java-bytecode content");
- }
- }
}
}
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index eb746d7..ca22e50 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -69,7 +69,6 @@
public Path seedsFile;
public boolean printMapping;
public Path printMappingFile;
- public boolean printMainDexList;
public Path printMainDexListFile;
public boolean ignoreMissingClasses = false;
public boolean skipMinification = false;
@@ -84,6 +83,7 @@
public boolean allowParameterName = false;
public boolean debug = false;
+ public boolean singleStepDebug = false;
public final TestingOptions testing = new TestingOptions();
// TODO(zerny): These stateful dictionaries do not belong here.
@@ -141,7 +141,9 @@
}
public static class TestingOptions {
- public Function<List<DexEncodedMethod>, List<DexEncodedMethod>> irOrdering;
+
+ public Function<List<DexEncodedMethod>, List<DexEncodedMethod>> irOrdering
+ = Function.identity();
}
public static class AttributeRemovalOptions {
diff --git a/src/main/java/com/android/tools/r8/utils/MainDexList.java b/src/main/java/com/android/tools/r8/utils/MainDexList.java
index b219314..826901a 100644
--- a/src/main/java/com/android/tools/r8/utils/MainDexList.java
+++ b/src/main/java/com/android/tools/r8/utils/MainDexList.java
@@ -28,6 +28,18 @@
}
}
+ public static DexType parse(String clazz, DexItemFactory itemFactory) {
+ if (!clazz.endsWith(CLASS_EXTENSION)) {
+ throw new CompilationError("Illegal main-dex-list entry '" + clazz + "'.");
+ }
+ String name = clazz.substring(0, clazz.length() - CLASS_EXTENSION.length());
+ if (name.contains("" + JAVA_PACKAGE_SEPARATOR)) {
+ throw new CompilationError("Illegal main-dex-list entry '" + clazz + "'.");
+ }
+ String descriptor = "L" + name + ";";
+ return itemFactory.createType(descriptor);
+ }
+
public static Set<DexType> parse(InputStream input, DexItemFactory itemFactory) {
Set<DexType> result = Sets.newIdentityHashSet();
try {
@@ -35,15 +47,7 @@
new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
String line;
while ((line = file.readLine()) != null) {
- if (!line.endsWith(CLASS_EXTENSION)) {
- throw new CompilationError("Illegal main-dex-list entry '" + line + "'.");
- }
- String name = line.substring(0, line.length() - CLASS_EXTENSION.length());
- if (name.contains("" + JAVA_PACKAGE_SEPARATOR)) {
- throw new CompilationError("Illegal main-dex-list entry '" + line + "'.");
- }
- String descriptor = "L" + name + ";";
- result.add(itemFactory.createType(descriptor));
+ result.add(parse(line, itemFactory));
}
} catch (IOException e) {
throw new CompilationError("Cannot load main-dex-list.");
diff --git a/src/main/java/com/android/tools/r8/utils/OneShotByteResource.java b/src/main/java/com/android/tools/r8/utils/OneShotByteResource.java
new file mode 100644
index 0000000..51aa312
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/utils/OneShotByteResource.java
@@ -0,0 +1,36 @@
+// Copyright (c) 2017, 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.utils;
+
+import com.android.tools.r8.Resource;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+
+class OneShotByteResource extends Resource {
+
+ private byte[] bytes;
+ private final Set<String> classDescriptors;
+
+ OneShotByteResource(Kind kind, byte[] bytes, Set<String> classDescriptors) {
+ super(kind);
+ assert bytes != null;
+ this.bytes = bytes;
+ this.classDescriptors = classDescriptors;
+ }
+
+ @Override
+ public Set<String> getClassDescriptors() {
+ return classDescriptors;
+ }
+
+ @Override
+ public InputStream getStream() throws IOException {
+ assert bytes != null;
+ InputStream result = new ByteArrayInputStream(bytes);
+ bytes = null;
+ return result;
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/utils/ProgramFileArchiveReader.java b/src/main/java/com/android/tools/r8/utils/ProgramFileArchiveReader.java
new file mode 100644
index 0000000..814ffd1
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/utils/ProgramFileArchiveReader.java
@@ -0,0 +1,82 @@
+// Copyright (c) 2017, 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.utils;
+
+import static com.android.tools.r8.utils.FileUtils.isArchive;
+import static com.android.tools.r8.utils.FileUtils.isClassFile;
+import static com.android.tools.r8.utils.FileUtils.isDexFile;
+
+import com.android.tools.r8.Resource;
+import com.android.tools.r8.errors.CompilationError;
+import com.google.common.io.ByteStreams;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipInputStream;
+
+class ProgramFileArchiveReader {
+
+ private final Path archive;
+ private List<Resource> dexResources = null;
+ private List<Resource> classResources = null;
+
+ ProgramFileArchiveReader(Path archive) {
+ this.archive = archive;
+ }
+
+ private void readArchive() throws IOException {
+ assert isArchive(archive);
+ dexResources = new ArrayList<>();
+ classResources = new ArrayList<>();
+ try (ZipInputStream stream = new ZipInputStream(new FileInputStream(archive.toFile()))) {
+ ZipEntry entry;
+ while ((entry = stream.getNextEntry()) != null) {
+ Path name = Paths.get(entry.getName());
+ if (isDexFile(name)) {
+ Resource resource =
+ new OneShotByteResource(Resource.Kind.DEX, ByteStreams.toByteArray(stream), null);
+ dexResources.add(resource);
+ } else if (isClassFile(name)) {
+ String descriptor = PreloadedClassFileProvider.guessTypeDescriptor(name);
+ Resource resource = new OneShotByteResource(Resource.Kind.CLASSFILE,
+ ByteStreams.toByteArray(stream), Collections.singleton(descriptor));
+ classResources.add(resource);
+ }
+ }
+ } catch (ZipException e) {
+ throw new CompilationError(
+ "Zip error while reading '" + archive + "': " + e.getMessage(), e);
+ }
+ if (!dexResources.isEmpty() && !classResources.isEmpty()) {
+ throw new CompilationError(
+ "Cannot create android app from an archive '" + archive
+ + "' containing both DEX and Java-bytecode content");
+ }
+ }
+
+ public Collection<Resource> getDexProgramResources() throws IOException {
+ if (dexResources == null) {
+ readArchive();
+ }
+ List<Resource> result = dexResources;
+ dexResources = null;
+ return result;
+ }
+
+ public Collection<Resource> getClassProgramResources() throws IOException {
+ if (classResources == null) {
+ readArchive();
+ }
+ List<Resource> result = classResources;
+ classResources = null;
+ return result;
+ }
+}
diff --git a/src/test/debugTestResources/Locals.java b/src/test/debugTestResources/Locals.java
index 3ad6596..3ab5d7b 100644
--- a/src/test/debugTestResources/Locals.java
+++ b/src/test/debugTestResources/Locals.java
@@ -188,6 +188,29 @@
}
}
+ public static int stepEmptyForLoopBody1(int n) {
+ int i;
+ for (i = 0; i < n; i++) ;
+ return i;
+ }
+
+ public static int stepEmptyForLoopBody2(int n) {
+ int i;
+ for (i = 0; i < n; i++) {
+ // has a line but still empty...
+ }
+ return i;
+ }
+
+ public static int stepNonEmptyForLoopBody(int n) {
+ int i;
+ for (i = 0; i < n; i++)
+ nop();
+ return i;
+ }
+
+ public static void nop() {}
+
public static void main(String[] args) {
noLocals();
unusedLocals();
@@ -198,6 +221,9 @@
reverseRange(1,2,3,4,5,6,7);
new Locals().lotsOfArrayLength();
new Locals().foo(21);
+ stepEmptyForLoopBody1(3);
+ stepEmptyForLoopBody2(3);
+ stepNonEmptyForLoopBody(3);
}
}
diff --git a/src/test/examples/enumproto/Enumproto.java b/src/test/examples/enumproto/Enumproto.java
new file mode 100644
index 0000000..9176378
--- /dev/null
+++ b/src/test/examples/enumproto/Enumproto.java
@@ -0,0 +1,66 @@
+// Copyright (c) 2017, 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 enumproto;
+
+
+import enumproto.GeneratedEnumProto.Enum;
+import enumproto.three.GeneratedEnumProto.EnumThree;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class Enumproto {
+
+ private static final byte[] WITH_ALL_FIELDS = new byte[]{6, 8, 42, 16, 2, 24, 3};
+ private static final byte[] WITH_DEFAULT_FOR_ENUM = new byte[]{2, 8, 42};
+
+
+ public static void main(String... args) throws IOException {
+ readProtoAndPrintDaEnum(WITH_ALL_FIELDS);
+ readProtoAndPrintDaEnum(WITH_DEFAULT_FOR_ENUM);
+ readProtoThreeAndPrintDaEnum(WITH_ALL_FIELDS);
+ readProtoThreeAndPrintDaEnum(WITH_DEFAULT_FOR_ENUM);
+ roundTrip(WITH_ALL_FIELDS);
+ roundTrip(WITH_DEFAULT_FOR_ENUM);
+ roundTripThree(WITH_ALL_FIELDS);
+ roundTripThree(WITH_DEFAULT_FOR_ENUM);
+ }
+
+ private static void readProtoAndPrintDaEnum(byte[] bytes) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(bytes);
+ Enum.Builder builder = Enum.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Enum buffer = builder.build();
+ System.out.println(buffer.getEnum());
+ }
+
+ private static void readProtoThreeAndPrintDaEnum(byte[] bytes) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(bytes);
+ EnumThree.Builder builder = EnumThree.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ EnumThree buffer = builder.build();
+ System.out.println(buffer.getEnum());
+ }
+
+ private static void roundTrip(byte[] bytes) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(bytes);
+ Enum.Builder builder = Enum.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Enum buffer = builder.build();
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ buffer.writeDelimitedTo(output);
+ readProtoAndPrintDaEnum(output.toByteArray());
+ }
+
+ private static void roundTripThree(byte[] bytes) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(bytes);
+ EnumThree.Builder builder = EnumThree.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ EnumThree buffer = builder.build();
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ buffer.writeDelimitedTo(output);
+ readProtoThreeAndPrintDaEnum(output.toByteArray());
+ }
+
+}
diff --git a/src/test/examples/enumproto/enum.proto b/src/test/examples/enumproto/enum.proto
new file mode 100644
index 0000000..0fa5695
--- /dev/null
+++ b/src/test/examples/enumproto/enum.proto
@@ -0,0 +1,25 @@
+// Copyright (c) 2017, 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.
+syntax = "proto2";
+package enumproto;
+
+option java_outer_classname = "GeneratedEnumProto";
+
+message Enum {
+ required int32 id = 1;
+ enum DaEnum {
+ UNKOWN = 0;
+ KNOWN = 1;
+ BELIEF = 2;
+ }
+ optional DaEnum enum = 2;
+ enum OtherEnum {
+ BLACK = 0;
+ RED = 1;
+ GREEN = 2;
+ OKALALALA = 3;
+ }
+ optional OtherEnum other = 3;
+}
+
diff --git a/src/test/examples/enumproto/enum_three.proto b/src/test/examples/enumproto/enum_three.proto
new file mode 100644
index 0000000..a2731fb
--- /dev/null
+++ b/src/test/examples/enumproto/enum_three.proto
@@ -0,0 +1,25 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto3";
+package enumproto.three;
+
+option java_outer_classname = "GeneratedEnumProto";
+
+message EnumThree {
+ int32 id = 1;
+ enum DaEnum {
+ UNKOWN = 0;
+ KNOWN = 1;
+ BELIEF = 2;
+ }
+ DaEnum enum = 2;
+ enum OtherEnum {
+ BLACK = 0;
+ RED = 1;
+ GREEN = 2;
+ OKALALALA = 3;
+ }
+ OtherEnum other = 3;
+}
+
diff --git a/src/test/examples/enumproto/keep-rules.txt b/src/test/examples/enumproto/keep-rules.txt
new file mode 100644
index 0000000..088f88f
--- /dev/null
+++ b/src/test/examples/enumproto/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class enumproto.Enumproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/inlining/InlineConstructorFinalField.java b/src/test/examples/inlining/InlineConstructorFinalField.java
new file mode 100644
index 0000000..093a2ac
--- /dev/null
+++ b/src/test/examples/inlining/InlineConstructorFinalField.java
@@ -0,0 +1,23 @@
+// Copyright (c) 2017, 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 inlining;
+
+public class InlineConstructorFinalField {
+
+ public final int number;
+
+ @CheckDiscarded
+ InlineConstructorFinalField(int value) {
+ number = value;
+ }
+
+ // This will not be inlined, as it sets a final field.
+ InlineConstructorFinalField() {
+ this(42);
+ }
+
+ public String toString() {
+ return "value: " + number;
+ }
+}
diff --git a/src/test/examples/inlining/Inlining.java b/src/test/examples/inlining/Inlining.java
index e013655..f89a0e1 100644
--- a/src/test/examples/inlining/Inlining.java
+++ b/src/test/examples/inlining/Inlining.java
@@ -3,6 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
package inlining;
+import inlining.pkg.OtherPublicClass;
+import inlining.pkg.PublicClass;
+import inlining.pkg.Subclass;
+
class A {
int a;
@@ -14,6 +18,14 @@
int a() {
return a;
}
+
+ int cannotInline(int v) {
+ // Cannot inline due to recursion.
+ if (v > 0) {
+ return cannotInline(v - 1);
+ }
+ return 42;
+ }
}
class B extends A {
@@ -21,6 +33,14 @@
B(int a) {
super(a);
}
+
+ int cannotInline(int v) {
+ return -1;
+ }
+
+ int callMethodInSuper() {
+ return super.cannotInline(10);
+ }
}
class InlineConstructor {
@@ -32,14 +52,39 @@
this.a = a;
}
- @CheckDiscarded
InlineConstructor(long a) {
this((int) a);
}
+ InlineConstructor(int a, int loopy) {
+ this.a = a;
+ // Make this too big to inline.
+ if (loopy > 10) {
+ throw new RuntimeException("Too big!");
+ }
+ for (int i = 1; i < loopy; i++) {
+ this.a = this.a * i;
+ }
+ }
+
+ @CheckDiscarded
+ InlineConstructor() {
+ this(42, 9);
+ }
+
static InlineConstructor create() {
return new InlineConstructor(10L);
}
+
+ static InlineConstructor createMore() {
+ new InlineConstructor(0, 0);
+ new InlineConstructor(0, 0);
+ new InlineConstructor(0, 0);
+ new InlineConstructor(0, 0);
+ new InlineConstructor(0, 0);
+ new InlineConstructor(0, 0);
+ return new InlineConstructor();
+ }
}
class InlineConstructorOfInner {
@@ -132,8 +177,25 @@
InlineConstructor ic = InlineConstructor.create();
Assert(ic != null);
+ InlineConstructor ic2 = InlineConstructor.createMore();
+ Assert(ic2 != null);
InlineConstructorOfInner icoi = new InlineConstructorOfInner();
Assert(icoi != null);
+
+ // Check that super calls are processed correctly.
+ new B(123).callMethodInSuper();
+
+ // Inline calls to package private methods
+ PublicClass.alsoCallsPackagePrivateMethod();
+ OtherPublicClass.callsMethodThatCallsPackagePrivateMethod();
+ // Inline calls to protected methods.
+ PublicClass.callsProtectedMethod3();
+ PublicClass.alsoReadsPackagePrivateField();
+ OtherPublicClass.callsMethodThatCallsProtectedMethod();
+ OtherPublicClass.callsMethodThatReadsFieldInPackagePrivateClass();
+ Subclass.callsMethodThatCallsProtectedMethod();
+ // Do not inline constructors which set final field.
+ System.out.println(new InlineConstructorFinalField());
}
private static boolean intCmpExpression(A a, A b) {
@@ -180,6 +242,7 @@
return 21.21F == floatConstantInline();
}
+ @CheckDiscarded
private static String stringConstantInline() {
return "Fisk er godt";
}
diff --git a/src/test/examples/inlining/keep-rules-discard.txt b/src/test/examples/inlining/keep-rules-discard.txt
index 66be962..ea5e143 100644
--- a/src/test/examples/inlining/keep-rules-discard.txt
+++ b/src/test/examples/inlining/keep-rules-discard.txt
@@ -8,9 +8,6 @@
public static void main(...);
}
-# allow access modification to enable minifcation
--allowaccessmodification
-
# check that methods have been inlined
-checkdiscard class * {
@inlining.CheckDiscarded *;
diff --git a/src/test/examples/inlining/keep-rules.txt b/src/test/examples/inlining/keep-rules.txt
index dd713bb..d60f1dc 100644
--- a/src/test/examples/inlining/keep-rules.txt
+++ b/src/test/examples/inlining/keep-rules.txt
@@ -7,6 +7,3 @@
-keep public class inlining.Inlining {
public static void main(...);
}
-
-# allow access modification to enable minifcation
--allowaccessmodification
diff --git a/src/test/examples/inlining/pkg/OtherPublicClass.java b/src/test/examples/inlining/pkg/OtherPublicClass.java
new file mode 100644
index 0000000..4d781d9
--- /dev/null
+++ b/src/test/examples/inlining/pkg/OtherPublicClass.java
@@ -0,0 +1,20 @@
+// Copyright (c) 2017, 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 inlining.pkg;
+
+public class OtherPublicClass {
+
+ public static String callsMethodThatCallsPackagePrivateMethod() {
+ return PublicClass.callsPackagePrivateMethod();
+ }
+
+ public static String callsMethodThatCallsProtectedMethod() {
+ return PublicClass.callsProtectedMethod();
+ }
+
+ public static int callsMethodThatReadsFieldInPackagePrivateClass() {
+ return PublicClass.readsPackagePrivateField();
+ }
+
+}
diff --git a/src/test/examples/inlining/pkg/PackagePrivateClass.java b/src/test/examples/inlining/pkg/PackagePrivateClass.java
new file mode 100644
index 0000000..ae05e8b
--- /dev/null
+++ b/src/test/examples/inlining/pkg/PackagePrivateClass.java
@@ -0,0 +1,9 @@
+// Copyright (c) 2017, 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 inlining.pkg;
+
+class PackagePrivateClass {
+
+ public static int aField = 42;
+}
diff --git a/src/test/examples/inlining/pkg/PublicClass.java b/src/test/examples/inlining/pkg/PublicClass.java
new file mode 100644
index 0000000..17cdea4
--- /dev/null
+++ b/src/test/examples/inlining/pkg/PublicClass.java
@@ -0,0 +1,59 @@
+// Copyright (c) 2017, 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 inlining.pkg;
+
+import inlining.CheckDiscarded;
+
+public class PublicClass {
+
+ protected static String protectedMethod() {
+ return "Hello";
+ }
+
+ @CheckDiscarded
+ static String callsProtectedMethod() {
+ return protectedMethod();
+ }
+
+ @CheckDiscarded
+ static String callsProtectedMethod2() {
+ return protectedMethod();
+ }
+
+ public static String callsProtectedMethod3() {
+ return protectedMethod();
+ }
+
+ static String packagePrivateMethod() {
+ return "World";
+ }
+
+ @CheckDiscarded
+ static int readsPackagePrivateField() {
+ return PackagePrivateClass.aField;
+ }
+
+ public static int alsoReadsPackagePrivateField() {
+ return PackagePrivateClass.aField;
+ }
+
+ @CheckDiscarded
+ public static String callsPackagePrivateMethod() {
+ return packagePrivateMethod();
+ }
+
+ public static String alsoCallsPackagePrivateMethod() {
+ return packagePrivateMethod();
+ }
+
+ public static void callMeToPreventInling() {
+ // Call it three times so it does not get inlined.
+ packagePrivateMethod();
+ packagePrivateMethod();
+ packagePrivateMethod();
+ protectedMethod();
+ protectedMethod();
+ protectedMethod();
+ }
+}
diff --git a/src/test/examples/inlining/pkg/Subclass.java b/src/test/examples/inlining/pkg/Subclass.java
new file mode 100644
index 0000000..f917697
--- /dev/null
+++ b/src/test/examples/inlining/pkg/Subclass.java
@@ -0,0 +1,11 @@
+// Copyright (c) 2017, 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 inlining.pkg;
+
+public class Subclass extends PublicClass {
+
+ public static String callsMethodThatCallsProtectedMethod() {
+ return PublicClass.callsProtectedMethod2();
+ }
+}
diff --git a/src/test/examples/nestedproto1/Nestedproto.java b/src/test/examples/nestedproto1/Nestedproto.java
new file mode 100644
index 0000000..fe1a535
--- /dev/null
+++ b/src/test/examples/nestedproto1/Nestedproto.java
@@ -0,0 +1,31 @@
+// Copyright (c) 2017, 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 nestedproto1;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import nestedproto1.GeneratedNestedProto.Outer;
+
+public class Nestedproto {
+
+ private static final byte[] NESTED_MESSAGE_WITH_BOTH = new byte[] {25, 8, 42, 18, 12, 8, 1, 18, 8,
+ 105, 110, 110, 101, 114, 79, 110, 101, 26, 7, 8, 2, 21, 0, 0, -10, 66};
+
+ private static final byte[] NESTED_MESSAGE_WITH_ONE = new byte[]{16, 8, 42, 18, 12, 8, 1, 18, 8,
+ 105,
+ 110, 110, 101, 114, 79, 110, 101};
+
+ public static void main(String... args) throws IOException {
+ testWith(NESTED_MESSAGE_WITH_BOTH);
+ testWith(NESTED_MESSAGE_WITH_ONE);
+ }
+
+ public static void testWith(byte[] data) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(data);
+ Outer.Builder builder = Outer.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Outer outer = builder.build();
+ System.out.println(outer.getInner().getOther());
+ }
+}
diff --git a/src/test/examples/nestedproto1/keep-rules.txt b/src/test/examples/nestedproto1/keep-rules.txt
new file mode 100644
index 0000000..1c47672
--- /dev/null
+++ b/src/test/examples/nestedproto1/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class nestedproto1.Nestedproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/nestedproto1/nested.proto b/src/test/examples/nestedproto1/nested.proto
new file mode 100644
index 0000000..0d05749
--- /dev/null
+++ b/src/test/examples/nestedproto1/nested.proto
@@ -0,0 +1,24 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto2";
+package nestedproto1;
+
+option java_outer_classname = "GeneratedNestedProto";
+
+message NestedOne {
+ required int32 id = 1;
+ optional string other = 2;
+}
+
+message NestedTwo {
+ required int32 id = 1;
+ optional float other = 2;
+}
+
+message Outer {
+ required int32 id = 1;
+ required NestedOne inner = 2;
+ optional NestedTwo inner2 = 3;
+}
+
diff --git a/src/test/examples/nestedproto2/Nestedproto.java b/src/test/examples/nestedproto2/Nestedproto.java
new file mode 100644
index 0000000..59217de
--- /dev/null
+++ b/src/test/examples/nestedproto2/Nestedproto.java
@@ -0,0 +1,33 @@
+// Copyright (c) 2017, 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 nestedproto2;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import nestedproto2.GeneratedNestedProto.Outer;
+
+public class Nestedproto {
+
+ private static final byte[] NESTED_MESSAGE_WITH_BOTH = new byte[]{25, 8, 42, 18, 12, 8, 1, 18, 8,
+ 105, 110, 110, 101, 114, 79, 110, 101, 26, 7, 8, 2, 21, 0, 0, -10, 66};
+
+ private static final byte[] NESTED_MESSAGE_WITH_ONE = new byte[]{16, 8, 42, 18, 12, 8, 1, 18, 8,
+ 105,
+ 110, 110, 101, 114, 79, 110, 101};
+
+ // Test that all fields remain when roundtripping with removed fields.
+ public static void main(String... args) throws IOException {
+ testWith(NESTED_MESSAGE_WITH_BOTH);
+ testWith(NESTED_MESSAGE_WITH_ONE);
+ }
+
+ private static void testWith(byte[] data) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(data);
+ Outer.Builder builder = Outer.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ builder.setId(1982);
+ Outer outer = builder.build();
+ outer.writeTo(System.out);
+ }
+}
diff --git a/src/test/examples/nestedproto2/keep-rules.txt b/src/test/examples/nestedproto2/keep-rules.txt
new file mode 100644
index 0000000..87c9218
--- /dev/null
+++ b/src/test/examples/nestedproto2/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class nestedproto2.Nestedproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/nestedproto2/nested.proto b/src/test/examples/nestedproto2/nested.proto
new file mode 100644
index 0000000..ac56f40
--- /dev/null
+++ b/src/test/examples/nestedproto2/nested.proto
@@ -0,0 +1,24 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto2";
+package nestedproto2;
+
+option java_outer_classname = "GeneratedNestedProto";
+
+message NestedOne {
+ required int32 id = 1;
+ optional string other = 2;
+}
+
+message NestedTwo {
+ required int32 id = 1;
+ optional float other = 2;
+}
+
+message Outer {
+ required int32 id = 1;
+ required NestedOne inner = 2;
+ optional NestedTwo inner2 = 3;
+}
+
diff --git a/src/test/examples/oneofproto/Oneofproto.java b/src/test/examples/oneofproto/Oneofproto.java
new file mode 100644
index 0000000..261705f
--- /dev/null
+++ b/src/test/examples/oneofproto/Oneofproto.java
@@ -0,0 +1,38 @@
+// Copyright (c) 2017, 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 oneofproto;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import oneofproto.GeneratedOneOfProto.Oneof;
+
+public class Oneofproto {
+
+ private static final byte[] WITH_BOOL_FIELD = new byte[]{4, 8, 42, 24, 1};
+ private static final byte[] WITH_FLOAT_FIELD = new byte[]{7, 8, 42, 21, 0, 0, -10, 66};
+ private static final byte[] WITH_STRING_FIELD = new byte[]{9, 8, 42, 34, 5, 104, 101, 108, 108,
+ 111};
+ private static final byte[] WITH_NO_FIELD = new byte[]{2, 8, 42};
+
+
+ public static void main(String... args) throws IOException {
+ roundTrip(WITH_BOOL_FIELD);
+ roundTrip(WITH_FLOAT_FIELD);
+ roundTrip(WITH_STRING_FIELD);
+ roundTrip(WITH_NO_FIELD);
+ }
+
+ private static void roundTrip(byte[] data) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(data);
+ Oneof.Builder builder = Oneof.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Oneof oneof = builder.build();
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ oneof.writeDelimitedTo(output);
+ System.out.println(Arrays.toString(output.toByteArray()));
+ }
+
+}
diff --git a/src/test/examples/oneofproto/keep-rules.txt b/src/test/examples/oneofproto/keep-rules.txt
new file mode 100644
index 0000000..70f00f1
--- /dev/null
+++ b/src/test/examples/oneofproto/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class oneofproto.Oneofproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/oneofproto/oneof.proto b/src/test/examples/oneofproto/oneof.proto
new file mode 100644
index 0000000..c5a67a1
--- /dev/null
+++ b/src/test/examples/oneofproto/oneof.proto
@@ -0,0 +1,17 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto2";
+package oneofproto;
+
+option java_outer_classname = "GeneratedOneOfProto";
+
+message Oneof {
+ required int32 id = 1;
+ oneof otherfields {
+ float floatField = 2;
+ bool boolField = 3;
+ string stringField = 4;
+ }
+}
+
diff --git a/src/test/examples/protowithexts/withexts.proto b/src/test/examples/protowithexts/withexts.proto
new file mode 100644
index 0000000..d384173
--- /dev/null
+++ b/src/test/examples/protowithexts/withexts.proto
@@ -0,0 +1,19 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto2";
+package protowithexts;
+
+option java_outer_classname = "GeneratedProtoWithExts";
+
+message Simple {
+ required int32 id = 1;
+
+ optional int32 other = 2;
+
+ extensions 10 to 19;
+}
+
+extend Simple {
+ optional string extra = 10;
+}
diff --git a/src/test/examples/repeatedproto/Repeatedproto.java b/src/test/examples/repeatedproto/Repeatedproto.java
new file mode 100644
index 0000000..280070d
--- /dev/null
+++ b/src/test/examples/repeatedproto/Repeatedproto.java
@@ -0,0 +1,22 @@
+// Copyright (c) 2017, 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 repeatedproto;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import repeatedproto.GeneratedRepeatedProto.Repeated;
+
+public class Repeatedproto {
+
+ private static final byte[] WITH_ALL_FIELDS = new byte[]{29, 8, 123, 18, 3, 111, 110, 101, 18, 3,
+ 116, 119, 111, 18, 5, 116, 104, 114, 101, 101, 24, 1, 34, 2, 8, 42, 34, 2, 8, 42};
+
+ public static void main(String... args) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(WITH_ALL_FIELDS);
+ Repeated.Builder builder = Repeated.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Repeated repeated = builder.build();
+ System.out.println(repeated.getRepeatedList());
+ }
+}
diff --git a/src/test/examples/repeatedproto/keep-rules.txt b/src/test/examples/repeatedproto/keep-rules.txt
new file mode 100644
index 0000000..3d02352
--- /dev/null
+++ b/src/test/examples/repeatedproto/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class repeatedproto.Repeatedproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/repeatedproto/repeated.proto b/src/test/examples/repeatedproto/repeated.proto
new file mode 100644
index 0000000..7414e6f
--- /dev/null
+++ b/src/test/examples/repeatedproto/repeated.proto
@@ -0,0 +1,20 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto2";
+package repeatedproto;
+
+option java_outer_classname = "GeneratedRepeatedProto";
+
+message Repeated {
+ required int32 id = 1;
+ repeated string repeated = 2;
+ repeated bool other = 3;
+
+ message Sub {
+ required int32 value = 1;
+ }
+
+ repeated Sub sub = 4;
+}
+
diff --git a/src/test/examples/repeatedproto/repeated_three.proto b/src/test/examples/repeatedproto/repeated_three.proto
new file mode 100644
index 0000000..7da7881
--- /dev/null
+++ b/src/test/examples/repeatedproto/repeated_three.proto
@@ -0,0 +1,15 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto3";
+package repeatedproto.three;
+
+option java_outer_classname = "GeneratedRepeatedProto";
+
+
+message RepeatedThree {
+ int32 id = 1;
+ repeated string repeated = 2;
+ repeated bool other = 3;
+}
+
diff --git a/src/test/examples/simpleproto1/Simpleproto.java b/src/test/examples/simpleproto1/Simpleproto.java
new file mode 100644
index 0000000..d07ce8d
--- /dev/null
+++ b/src/test/examples/simpleproto1/Simpleproto.java
@@ -0,0 +1,56 @@
+// Copyright (c) 2017, 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 simpleproto1;
+
+import com.google.protobuf.UninitializedMessageException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import simpleproto1.GeneratedSimpleProto.Simple;
+
+public class Simpleproto {
+
+ private static final byte[] WITH_REQUIRED_FIELDS = new byte[]{7, 8, 42, 21, 0, 0, -10, 66};
+ private static final byte[] WITH_MISSING_FIELD = new byte[]{2, 8, 42};
+
+
+ public static void main(String... args) throws IOException {
+ readProtoWithAllReqFields();
+ partialBuildFails();
+ partialReadFails();
+ }
+
+ private static void partialBuildFails() {
+ Simple.Builder builder = Simple.newBuilder();
+ builder.setId(32);
+ try {
+ builder.build();
+ } catch (UninitializedMessageException e) {
+ System.out.println("got exception");
+ }
+ }
+
+ private static void partialReadFails() throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(WITH_MISSING_FIELD);
+ Simple.Builder builder = Simple.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ try {
+ builder.build();
+ } catch (UninitializedMessageException e) {
+ System.out.println("got exception");
+ }
+ }
+
+ private static void readProtoWithAllReqFields() throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(WITH_REQUIRED_FIELDS);
+ Simple.Builder builder = Simple.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Simple simple = builder.build();
+ ByteArrayOutputStream output = new ByteArrayOutputStream(WITH_REQUIRED_FIELDS.length);
+ simple.writeDelimitedTo(output);
+ System.out.println(Arrays.toString(output.toByteArray()));
+ System.out.println(Arrays.equals(WITH_REQUIRED_FIELDS, output.toByteArray()));
+ }
+}
diff --git a/src/test/examples/simpleproto1/keep-rules.txt b/src/test/examples/simpleproto1/keep-rules.txt
new file mode 100644
index 0000000..3c3c33f
--- /dev/null
+++ b/src/test/examples/simpleproto1/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class simpleproto1.Simpleproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/simpleproto1/simple.proto b/src/test/examples/simpleproto1/simple.proto
new file mode 100644
index 0000000..f4e1be4
--- /dev/null
+++ b/src/test/examples/simpleproto1/simple.proto
@@ -0,0 +1,14 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto2";
+package simpleproto1;
+
+option java_outer_classname = "GeneratedSimpleProto";
+
+message Simple {
+ required int32 id = 1;
+ required float unusedRequired = 2;
+ optional bool other = 3;
+}
+
diff --git a/src/test/examples/simpleproto2/Simpleproto.java b/src/test/examples/simpleproto2/Simpleproto.java
new file mode 100644
index 0000000..f333d72
--- /dev/null
+++ b/src/test/examples/simpleproto2/Simpleproto.java
@@ -0,0 +1,30 @@
+// Copyright (c) 2017, 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 simpleproto2;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import simpleproto2.GeneratedSimpleProto.Simple;
+
+/**
+ * A class that only uses a has method but otherwise ignores the value of a field.
+ */
+public class Simpleproto {
+
+ private static final byte[] WITHOUT_HASME_FIELD = new byte[]{2, 8, 42};
+ private static final byte[] WITH_HASME_FIELD = new byte[]{7, 8, 42, 21, 0, 0, -10, 66};
+
+ public static void main(String... args) throws IOException {
+ testHasWorks(WITHOUT_HASME_FIELD, false);
+ testHasWorks(WITH_HASME_FIELD, true);
+ }
+
+ private static void testHasWorks(byte[] msg, boolean expected) throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(msg);
+ Simple.Builder builder = Simple.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Simple simple = builder.build();
+ System.out.println("Expected " + expected + " and got " + simple.hasHasMe());
+ }
+}
diff --git a/src/test/examples/simpleproto2/keep-rules.txt b/src/test/examples/simpleproto2/keep-rules.txt
new file mode 100644
index 0000000..8f9c93e
--- /dev/null
+++ b/src/test/examples/simpleproto2/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class simpleproto2.Simpleproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/simpleproto2/simple.proto b/src/test/examples/simpleproto2/simple.proto
new file mode 100644
index 0000000..b9173e9
--- /dev/null
+++ b/src/test/examples/simpleproto2/simple.proto
@@ -0,0 +1,14 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto2";
+package simpleproto2;
+
+option java_outer_classname = "GeneratedSimpleProto";
+
+message Simple {
+ required int32 id = 1;
+ optional float hasMe = 2;
+ optional int32 other = 3;
+}
+
diff --git a/src/test/examples/simpleproto3/Simpleproto.java b/src/test/examples/simpleproto3/Simpleproto.java
new file mode 100644
index 0000000..2cdbae8
--- /dev/null
+++ b/src/test/examples/simpleproto3/Simpleproto.java
@@ -0,0 +1,65 @@
+// Copyright (c) 2017, 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 simpleproto3;
+
+import com.google.protobuf.UninitializedMessageException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import simpleproto3.GeneratedSimpleProto.Simple;
+
+public class Simpleproto {
+
+ private static final byte[] WITH_REQUIRED_FIELDS = new byte[]{7, 8, 42, 21, 0, 0, -10, 66};
+ private static final byte[] WITH_MISSING_FIELD = new byte[]{2, 8, 42};
+
+
+ public static void main(String... args) throws IOException {
+ readProtoWithAllReqFields();
+ partialBuildFails();
+ partialReadFails();
+ }
+
+ private static void partialBuildFails() {
+ Simple.Builder builder = Simple.newBuilder();
+ builder.setId(32);
+ try {
+ builder.build();
+ } catch (UninitializedMessageException e) {
+ System.out.println("got exception");
+ }
+ }
+
+ private static void partialReadFails() throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(WITH_MISSING_FIELD);
+ Simple.Builder builder = Simple.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ try {
+ builder.build();
+ } catch (UninitializedMessageException e) {
+ System.out.println("got exception");
+ }
+ }
+
+ private static void readProtoWithAllReqFields() throws IOException {
+ ByteArrayInputStream input = new ByteArrayInputStream(WITH_REQUIRED_FIELDS);
+ Simple.Builder builder = Simple.newBuilder();
+ builder.mergeDelimitedFrom(input);
+ Simple simple = builder.build();
+ ByteArrayOutputStream output = new ByteArrayOutputStream(WITH_REQUIRED_FIELDS.length);
+ simple.writeDelimitedTo(output);
+ System.out.println(isContained(WITH_REQUIRED_FIELDS, output.toByteArray()));
+ }
+
+ // After shaking, the serialized proto will no longer contain fields that are not referenced.
+ private static boolean isContained(byte[] fullBytes, byte[] reducedBytes) {
+ int j = 1;
+ for (int i = 1; i < fullBytes.length && j < reducedBytes.length; i++) {
+ if (fullBytes[i] == reducedBytes[j]) {
+ j++;
+ }
+ }
+ return j == reducedBytes.length;
+ }
+}
diff --git a/src/test/examples/simpleproto3/keep-rules.txt b/src/test/examples/simpleproto3/keep-rules.txt
new file mode 100644
index 0000000..186e9f8
--- /dev/null
+++ b/src/test/examples/simpleproto3/keep-rules.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, 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.
+
+# Keep the application entry point. Get rid of everything that is not
+# reachable from there.
+-keep public class simpleproto3.Simpleproto {
+ public static void main(...);
+}
+
+# allow access modification to enable minification
+-allowaccessmodification
diff --git a/src/test/examples/simpleproto3/simple.proto b/src/test/examples/simpleproto3/simple.proto
new file mode 100644
index 0000000..87512d1
--- /dev/null
+++ b/src/test/examples/simpleproto3/simple.proto
@@ -0,0 +1,14 @@
+// Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
+// // for details. All rights reserved. Use of this source code is governed by a
+// // BSD-style license that can be found in the LICENSE file.
+syntax = "proto3";
+package simpleproto3;
+
+option java_outer_classname = "GeneratedSimpleProto";
+
+message Simple {
+ int32 id = 1;
+ float unusedRequired = 2;
+ bool other = 3;
+}
+
diff --git a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
index eba8db6..063d5fc 100644
--- a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
+++ b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.Multimap;
import java.util.Collection;
+import java.util.function.BiFunction;
public class JctfTestSpecifications {
@@ -4808,6 +4809,20 @@
.put("lang.RuntimePermission.Class.RuntimePermission_class_A13", any())
.build(); // end of timeoutsWithArt
+ public static final Multimap<String, TestCondition> requiresInliningDisabled =
+ new ImmutableListMultimap.Builder<String, TestCondition>()
+ .put("lang.Throwable.printStackTrace.Throwable_printStackTrace_A01", match(R8_COMPILER))
+ .put("lang.Throwable.printStackTraceLjava_io_PrintWriter.Throwable_printStackTrace_A01",
+ match(R8_COMPILER))
+ .put("lang.Throwable.printStackTraceLjava_io_PrintStream.Throwable_printStackTrace_A01",
+ match(R8_COMPILER))
+ .put("lang.ref.SoftReference.isEnqueued.SoftReference_isEnqueued_A01", match(R8_COMPILER))
+ .put("lang.ref.WeakReference.isEnqueued.WeakReference_isEnqueued_A01", match(R8_COMPILER))
+ .put("lang.StackTraceElement.getMethodName.StackTraceElement_getMethodName_A01",
+ match(R8_COMPILER))
+ .put("lang.Thread.dumpStack.Thread_dumpStack_A01", match(R8_COMPILER))
+ .build();
+
private static final boolean testMatch(
Multimap<String, TestCondition> testConditions,
String name,
@@ -4823,11 +4838,12 @@
return false;
}
- public static final Outcome getExpectedOutcome(
+ public static final <T> T getExpectedOutcome(
String name,
CompilerUnderTest compilerUnderTest,
DexVm dexVm,
- CompilationMode compilationMode) {
+ CompilationMode compilationMode,
+ BiFunction<Outcome, Boolean, T> consumer) {
Outcome outcome = null;
@@ -4842,6 +4858,11 @@
assert outcome == null;
outcome = Outcome.FLAKY_WITH_ART;
}
- return outcome == null ? Outcome.PASSES : outcome;
+ if (outcome == null) {
+ outcome = Outcome.PASSES;
+ }
+ boolean disableInlining = testMatch(requiresInliningDisabled, name, compilerUnderTest, dexVm,
+ compilationMode);
+ return consumer.apply(outcome, disableInlining);
}
}
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 22278e2..fabf8e7 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -7,6 +7,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import com.android.tools.r8.JctfTestSpecifications.Outcome;
import com.android.tools.r8.ToolHelper.ArtCommandBuilder;
import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ToolHelper.ProcessResult;
@@ -43,6 +44,7 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
+import java.util.function.BiFunction;
import java.util.stream.Collectors;
import org.junit.ComparisonFailure;
import org.junit.Rule;
@@ -743,6 +745,21 @@
DexVm.ART_4_4_4, DexVm.ART_5_1_1, DexVm.ART_6_0_1, DexVm.ART_7_0_0)))
.build();
+ public static List<String> requireInliningToBeDisabled = ImmutableList.of(
+ // Test for a specific stack trace that gets destroyed by inlining.
+ "492-checker-inline-invoke-interface",
+ "493-checker-inline-invoke-interface",
+ "488-checker-inline-recursive-calls",
+ "487-checker-inline-calls",
+ "122-npe",
+
+ // Calls some internal art methods that cannot tolerate inlining.
+ "466-get-live-vreg",
+
+ // Requires a certain call pattern to surface an Art bug.
+ "534-checker-bce-deoptimization"
+ );
+
private static List<String> failuresToTriage = ImmutableList.of(
// This is flaky.
"104-growth-limit",
@@ -812,11 +829,14 @@
private final boolean failsWithArtOriginalOnly;
// Test might produce different outputs.
private final boolean outputMayDiffer;
+ // Whether to disable inlining
+ private final boolean disableInlining;
TestSpecification(String name, DexTool dexTool,
File directory, boolean skipArt, boolean skipTest, boolean failsWithX8,
boolean failsWithArt, boolean failsWithArtOutput, boolean failsWithArtOriginalOnly,
- String nativeLibrary, boolean expectedToFailWithX8, boolean outputMayDiffer) {
+ String nativeLibrary, boolean expectedToFailWithX8, boolean outputMayDiffer,
+ boolean disableInlining) {
this.name = name;
this.dexTool = dexTool;
this.nativeLibrary = nativeLibrary;
@@ -829,12 +849,13 @@
this.failsWithArtOriginalOnly = failsWithArtOriginalOnly;
this.expectedToFailWithX8 = expectedToFailWithX8;
this.outputMayDiffer = outputMayDiffer;
+ this.disableInlining = disableInlining;
}
TestSpecification(String name, DexTool dexTool, File directory, boolean skipArt,
- boolean failsWithArt) {
+ boolean failsWithArt, boolean disableInlining) {
this(name, dexTool, directory, skipArt,
- false, false, failsWithArt, false, false, null, false, false);
+ false, false, failsWithArt, false, false, null, false, false, disableInlining);
}
public File resolveFile(String name) {
@@ -889,9 +910,9 @@
}
private static Map<SpecificationKey, TestSpecification> getTestsMap(
- CompilerUnderTest compilerUnderTest, CompilationMode compilationMode, DexVm version) {
+ CompilerUnderTest compilerUnderTest, CompilationMode compilationMode, DexVm dexVm) {
File artTestDir = new File(ART_TESTS_DIR);
- if (version != DexVm.ART_DEFAULT) {
+ if (dexVm != DexVm.ART_DEFAULT) {
artTestDir = new File(ART_LEGACY_TESTS_DIR);
}
if (!artTestDir.exists()) {
@@ -911,7 +932,6 @@
// Collect the tests requiring the native library.
Set<String> useNativeLibrary = Sets.newHashSet(useJNI);
- DexVm dexVm = ToolHelper.getDexVm();
for (DexTool dexTool : DexTool.values()) {
// Collect the tests failing code generation.
Set<String> failsWithCompiler =
@@ -943,11 +963,11 @@
failsWithArt.addAll(tmpSet);
}
- if (!ToolHelper.isDefaultDexVm()) {
+ if (!ToolHelper.isDefaultDexVm(dexVm)) {
// Generally failing when not TOT art.
failsWithArt.addAll(expectedToFailRunWithArtNonDefault);
// Version specific failures
- failsWithArt.addAll(expectedToFailRunWithArtVersion.get(ToolHelper.getDexVm()));
+ failsWithArt.addAll(expectedToFailRunWithArtVersion.get(dexVm));
}
// Collect the tests failing with output differences in Art.
@@ -980,7 +1000,8 @@
failsRunWithArtOriginalOnly.contains(name),
useNativeLibrary.contains(name) ? "arttest" : null,
expectedToFailWithCompilerSet.contains(name),
- outputMayDiffer.contains(name)));
+ outputMayDiffer.contains(name),
+ requireInliningToBeDisabled.contains(name)));
}
}
return data;
@@ -1049,9 +1070,11 @@
CompilerUnderTest compilerUnderTest,
Collection<String> fileNames,
String resultPath,
- CompilationMode compilationMode)
+ CompilationMode compilationMode,
+ boolean disableInlining)
throws IOException, ProguardRuleParserException, ExecutionException, CompilationException {
- executeCompilerUnderTest(compilerUnderTest, fileNames, resultPath, compilationMode, null);
+ executeCompilerUnderTest(compilerUnderTest, fileNames, resultPath, compilationMode, null,
+ disableInlining);
}
private void executeCompilerUnderTest(
@@ -1059,7 +1082,8 @@
Collection<String> fileNames,
String resultPath,
CompilationMode mode,
- String keepRulesFile)
+ String keepRulesFile,
+ boolean disableInlining)
throws IOException, ProguardRuleParserException, ExecutionException, CompilationException {
assert mode != null;
switch (compilerUnderTest) {
@@ -1100,6 +1124,9 @@
if (enableInterfaceMethodDesugaring.contains(name)) {
options.interfaceMethodDesugaring = OffOrAuto.Auto;
}
+ if (disableInlining) {
+ options.inlineAccessors = false;
+ }
});
break;
}
@@ -1159,6 +1186,15 @@
return auxClassFiles;
}
+ private static BiFunction<Outcome, Boolean, TestSpecification> jctfOutcomeToSpecification(
+ String name, DexTool dexTool, File resultDir) {
+ return (outcome, noInlining) -> new TestSpecification(name, dexTool, resultDir,
+ outcome == JctfTestSpecifications.Outcome.TIMEOUTS_WITH_ART
+ || outcome == JctfTestSpecifications.Outcome.FLAKY_WITH_ART,
+ outcome == JctfTestSpecifications.Outcome.FAILS_WITH_ART,
+ noInlining);
+ }
+
protected void runJctfTest(CompilerUnderTest compilerUnderTest, String classFilePath,
String fullClassName)
throws IOException, ProguardRuleParserException, ExecutionException, CompilationException {
@@ -1173,13 +1209,9 @@
File resultDir = temp.newFolder(firstCompilerUnderTest.toString().toLowerCase() + "-output");
- JctfTestSpecifications.Outcome expectedOutcome =
- JctfTestSpecifications.getExpectedOutcome(
- name, firstCompilerUnderTest, dexVm, compilationMode);
- TestSpecification specification = new TestSpecification(name, DexTool.NONE, resultDir,
- expectedOutcome == JctfTestSpecifications.Outcome.TIMEOUTS_WITH_ART
- || expectedOutcome == JctfTestSpecifications.Outcome.FLAKY_WITH_ART,
- expectedOutcome == JctfTestSpecifications.Outcome.FAILS_WITH_ART);
+ TestSpecification specification = JctfTestSpecifications.getExpectedOutcome(
+ name, firstCompilerUnderTest, dexVm, compilationMode,
+ jctfOutcomeToSpecification(name, DexTool.NONE, resultDir));
if (specification.skipTest) {
return;
@@ -1262,13 +1294,9 @@
.collect(Collectors.toList());
File r8ResultDir = temp.newFolder("r8-output");
compilationMode = CompilationMode.DEBUG;
- expectedOutcome =
- JctfTestSpecifications.getExpectedOutcome(
- name, CompilerUnderTest.R8_AFTER_D8, dexVm, compilationMode);
- specification = new TestSpecification(name, DexTool.DX, r8ResultDir,
- expectedOutcome == JctfTestSpecifications.Outcome.TIMEOUTS_WITH_ART
- || expectedOutcome == JctfTestSpecifications.Outcome.FLAKY_WITH_ART,
- expectedOutcome == JctfTestSpecifications.Outcome.FAILS_WITH_ART);
+ specification = JctfTestSpecifications.getExpectedOutcome(
+ name, CompilerUnderTest.R8_AFTER_D8, dexVm, compilationMode,
+ jctfOutcomeToSpecification(name, DexTool.DX, r8ResultDir));
if (specification.skipTest) {
return;
}
@@ -1292,7 +1320,8 @@
DexVm dexVm,
File resultDir)
throws IOException, ProguardRuleParserException, ExecutionException, CompilationException {
- executeCompilerUnderTest(compilerUnderTest, fileNames, resultDir.getAbsolutePath(), mode);
+ executeCompilerUnderTest(compilerUnderTest, fileNames, resultDir.getAbsolutePath(), mode,
+ specification.disableInlining);
if (!ToolHelper.artSupported()) {
return;
@@ -1445,7 +1474,8 @@
thrown.expect(CompilationError.class);
try {
executeCompilerUnderTest(
- compilerUnderTest, fileNames, resultDir.getCanonicalPath(), compilationMode, null);
+ compilerUnderTest, fileNames, resultDir.getCanonicalPath(), compilationMode,
+ specification.disableInlining);
} catch (CompilationException e) {
throw new CompilationError(e.getMessage(), e);
} catch (ExecutionException e) {
@@ -1456,12 +1486,14 @@
} else if (specification.failsWithX8) {
thrown.expect(Throwable.class);
executeCompilerUnderTest(
- compilerUnderTest, fileNames, resultDir.getCanonicalPath(), compilationMode);
+ compilerUnderTest, fileNames, resultDir.getCanonicalPath(), compilationMode,
+ specification.disableInlining);
System.err.println("Should have failed R8/D8 compilation with an exception.");
return;
} else {
executeCompilerUnderTest(
- compilerUnderTest, fileNames, resultDir.getCanonicalPath(), compilationMode);
+ compilerUnderTest, fileNames, resultDir.getCanonicalPath(), compilationMode,
+ specification.disableInlining);
}
if (!specification.skipArt && ToolHelper.artSupported()) {
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index d0032cd..6d6412b 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -341,8 +341,8 @@
}
// Returns if the passed in vm to use is the default.
- public static boolean isDefaultDexVm() {
- return getDexVm() == DexVm.ART_DEFAULT;
+ public static boolean isDefaultDexVm(DexVm dexVm) {
+ return dexVm == DexVm.ART_DEFAULT;
}
public static DexVm getDexVm() {
@@ -640,18 +640,36 @@
Consumer<ArtCommandBuilder> extras,
DexVm version)
throws IOException {
- // Run art on original.
- for (String file : files1) {
- assertTrue("file1 " + file + " must exists", Files.exists(Paths.get(file)));
+ return checkArtOutputIdentical(
+ version,
+ mainClass,
+ extras,
+ ImmutableList.of(ListUtils.map(files1, Paths::get), ListUtils.map(files2, Paths::get)));
+ }
+
+ public static String checkArtOutputIdentical(
+ DexVm version,
+ String mainClass,
+ Consumer<ArtCommandBuilder> extras,
+ Collection<Collection<Path>> programs)
+ throws IOException {
+ for (Collection<Path> program : programs) {
+ for (Path path : program) {
+ assertTrue("File " + path + " must exist", Files.exists(path));
+ }
}
- String output1 = ToolHelper.runArtNoVerificationErrors(files1, mainClass, extras, version);
- // Run art on R8 processed version.
- for (String file : files2) {
- assertTrue("file2 " + file + " must exists", Files.exists(Paths.get(file)));
+ String output = null;
+ for (Collection<Path> program : programs) {
+ String result =
+ ToolHelper.runArtNoVerificationErrors(
+ ListUtils.map(program, Path::toString), mainClass, extras, version);
+ if (output != null) {
+ assertEquals(output, result);
+ } else {
+ output = result;
+ }
}
- String output2 = ToolHelper.runArtNoVerificationErrors(files2, mainClass, extras, version);
- assertEquals(output1, output2);
- return output1;
+ return output;
}
public static void runDex2Oat(Path file, Path outFile) throws IOException {
diff --git a/src/test/java/com/android/tools/r8/compatdx/CompatDxTests.java b/src/test/java/com/android/tools/r8/compatdx/CompatDxTests.java
index 5af5c0c..dbe776d 100644
--- a/src/test/java/com/android/tools/r8/compatdx/CompatDxTests.java
+++ b/src/test/java/com/android/tools/r8/compatdx/CompatDxTests.java
@@ -6,6 +6,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.dex.Constants;
@@ -35,6 +36,8 @@
import org.junit.rules.TemporaryFolder;
public class CompatDxTests {
+ private static final int MAX_METHOD_COUNT = Constants.U16BIT_MAX;
+
private static final String EXAMPLE_JAR_FILE1 = "build/test/examples/arithmetic.jar";
private static final String EXAMPLE_JAR_FILE2 = "build/test/examples/barray.jar";
@@ -44,9 +47,6 @@
private static final String NUM_THREADS_5 = "--num-threads=5";
@Rule
- public ExpectedException thrown = ExpectedException.none();
-
- @Rule
public TemporaryFolder temp = ToolHelper.getTemporaryFolderForTest();
@Test
@@ -104,7 +104,7 @@
// Generate an application that fills the whole dex file.
AndroidApp generated =
MainDexListTests.generateApplication(
- ImmutableList.of("A"), Constants.ANDROID_L_API, Constants.U16BIT_MAX + 1);
+ ImmutableList.of("A"), Constants.ANDROID_L_API, MAX_METHOD_COUNT + 1);
Path applicationJar = temp.newFile("application.jar").toPath();
generated.write(applicationJar, OutputMode.Indexed);
runDexer(applicationJar.toString());
@@ -114,11 +114,19 @@
public void singleDexProgramIsTooLarge() throws IOException, ExecutionException {
// Generate an application that will not fit into a single dex file.
AndroidApp generated = MainDexListTests.generateApplication(
- ImmutableList.of("A", "B"), Constants.ANDROID_L_API, Constants.U16BIT_MAX / 2 + 2);
+ ImmutableList.of("A", "B"), Constants.ANDROID_L_API, MAX_METHOD_COUNT / 2 + 2);
Path applicationJar = temp.newFile("application.jar").toPath();
generated.write(applicationJar, OutputMode.Indexed);
- thrown.expect(CompilationError.class);
- runDexer(applicationJar.toString());
+ try {
+ runDexer(applicationJar.toString());
+ fail("Expect to fail, for there are many classes while multidex is not enabled.");
+ } catch (CompilationError e) {
+ // Make sure {@link MonoDexDistributor} was used.
+ assertTrue(e.getMessage().contains("single dex file"));
+ // Make sure what exceeds the limit is the number of methods.
+ assertTrue(e.getMessage().contains("# methods: "
+ + String.valueOf((MAX_METHOD_COUNT / 2 + 2) * 2)));
+ }
}
@Test
diff --git a/src/test/java/com/android/tools/r8/debug/DebugTestBase.java b/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
index 6a5f738..57a1ce8 100644
--- a/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
+++ b/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
@@ -623,15 +623,24 @@
));
}
+ private void failNoLocal(String localName) {
+ Assert.fail(
+ "line " + getLineNumber() + ": Expected local '" + localName + "' not present");
+ }
+
public void checkLocal(String localName) {
Optional<Variable> localVar = JUnit3Wrapper
.getVariableAt(mirror, getLocation(), localName);
- Assert.assertTrue("No local '" + localName + "'", localVar.isPresent());
+ if (!localVar.isPresent()) {
+ failNoLocal(localName);
+ }
}
public void checkLocal(String localName, Value expectedValue) {
Optional<Variable> localVar = getVariableAt(mirror, getLocation(), localName);
- Assert.assertTrue("No local '" + localName + "'", localVar.isPresent());
+ if (!localVar.isPresent()) {
+ failNoLocal(localName);
+ }
// Get value
CommandPacket commandPacket = new CommandPacket(
diff --git a/src/test/java/com/android/tools/r8/debug/LocalsTest.java b/src/test/java/com/android/tools/r8/debug/LocalsTest.java
index 1fd4bc9..16d1a60 100644
--- a/src/test/java/com/android/tools/r8/debug/LocalsTest.java
+++ b/src/test/java/com/android/tools/r8/debug/LocalsTest.java
@@ -348,4 +348,79 @@
run());
}
+ @Test
+ public void testStepEmptyForLoopBody1() throws Throwable {
+ runDebugTest(
+ "Locals",
+ breakpoint("Locals", "stepEmptyForLoopBody1"),
+ run(),
+ checkLocal("n", Value.createInt(3)),
+ checkNoLocal("i"),
+ stepOver(),
+ checkLocal("n", Value.createInt(3)),
+ checkLocal("i", Value.createInt(3)),
+ run());
+ }
+
+ @Test
+ public void testStepEmptyForLoopBody2() throws Throwable {
+ runDebugTest(
+ "Locals",
+ breakpoint("Locals", "stepEmptyForLoopBody2"),
+ run(),
+ checkLocal("n", Value.createInt(3)),
+ checkNoLocal("i"),
+ stepOver(),
+ checkLocal("n", Value.createInt(3)),
+ checkLocal("i", Value.createInt(3)),
+ run());
+ }
+
+ @Test
+ public void testStepNonEmptyForLoopBody() throws Throwable {
+ final int LOOP_HEADER_LINE = 207;
+ final int LOOP_BODY_LINE = 208;
+ final int RETURN_LINE = 209;
+ final Value N = Value.createInt(3);
+ final Value I0 = Value.createInt(0);
+ final Value I1 = Value.createInt(1);
+ final Value I2 = Value.createInt(2);
+ final Value I3 = Value.createInt(3);
+ runDebugTest(
+ "Locals",
+ breakpoint("Locals", "stepNonEmptyForLoopBody"),
+ run(),
+ checkLine(SOURCE_FILE, LOOP_HEADER_LINE),
+ checkLocal("n", N),
+ checkNoLocal("i"),
+ stepOver(),
+ checkLine(SOURCE_FILE, LOOP_BODY_LINE),
+ checkLocal("n", N),
+ checkLocal("i", I0),
+ stepOver(),
+ checkLine(SOURCE_FILE, LOOP_HEADER_LINE),
+ checkLocal("n", N),
+ checkLocal("i", I0),
+ stepOver(),
+ checkLine(SOURCE_FILE, LOOP_BODY_LINE),
+ checkLocal("n", N),
+ checkLocal("i", I1),
+ stepOver(),
+ checkLine(SOURCE_FILE, LOOP_HEADER_LINE),
+ checkLocal("n", N),
+ checkLocal("i", I1),
+ stepOver(),
+ checkLine(SOURCE_FILE, LOOP_BODY_LINE),
+ checkLocal("n", N),
+ checkLocal("i", I2),
+ stepOver(),
+ checkLine(SOURCE_FILE, LOOP_HEADER_LINE),
+ checkLocal("n", N),
+ checkLocal("i", I2),
+ stepOver(),
+ checkLine(SOURCE_FILE, RETURN_LINE),
+ checkLocal("n", N),
+ checkLocal("i", I3),
+ run());
+ }
}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTest.java b/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTest.java
new file mode 100644
index 0000000..5a83545
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTest.java
@@ -0,0 +1,21 @@
+// Copyright (c) 2017, 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.debuginfo;
+
+public class ConditionalLocalTest {
+
+ public void foo(int x) {
+ if (x % 2 != 0) {
+ Integer obj = new Integer(x + x);
+ long l = obj.longValue();
+ x = (int) l;
+ System.out.print(obj);
+ }
+ return;
+ }
+
+ public static void main(String[] args) {
+ new ConditionalLocalTest().foo(21);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTestRunner.java
new file mode 100644
index 0000000..8348c0b
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTestRunner.java
@@ -0,0 +1,41 @@
+// Copyright (c) 2017, 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.debuginfo;
+
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.utils.AndroidApp;
+import org.junit.Test;
+
+public class ConditionalLocalTestRunner extends DebugInfoTestBase {
+
+ @Test
+ public void testConditionalLocal() throws Exception {
+ Class clazz = ConditionalLocalTest.class;
+
+ AndroidApp d8App = compileWithD8(clazz);
+ AndroidApp dxApp = getDxCompiledSources();
+
+ String expected = "42";
+ assertEquals(expected, runOnJava(clazz));
+ assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
+ assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
+
+ checkConditonalLocal(inspectMethod(d8App, clazz, "void", "foo", "int"));
+ checkConditonalLocal(inspectMethod(dxApp, clazz, "void", "foo", "int"));
+ }
+
+ private void checkConditonalLocal(DebugInfoInspector info) {
+ String self = ConditionalLocalTest.class.getCanonicalName();
+ String Integer = "java.lang.Integer";
+ info.checkStartLine(9);
+ info.checkLineHasExactLocals(9, "this", self, "x", "int");
+ info.checkLineHasExactLocals(10, "this", self, "x", "int");
+ info.checkLineHasExactLocals(11, "this", self, "x", "int", "obj", Integer);
+ info.checkLineHasExactLocals(12, "this", self, "x", "int", "obj", Integer, "l", "long");
+ info.checkLineHasExactLocals(13, "this", self, "x", "int", "obj", Integer, "l", "long");
+ info.checkNoLine(14);
+ info.checkLineHasExactLocals(15, "this", self, "x", "int");
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java
index 8df6f79..8a5b77d 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java
@@ -22,11 +22,11 @@
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
- checkBackBranchToSelf(inspectMethod(d8App, clazz, "int", "localsAtThrow", "int"));
- checkBackBranchToSelf(inspectMethod(dxApp, clazz, "int", "localsAtThrow", "int"));
+ checkLocalsAtThrow(inspectMethod(d8App, clazz, "int", "localsAtThrow", "int"));
+ checkLocalsAtThrow(inspectMethod(dxApp, clazz, "int", "localsAtThrow", "int"));
}
- private void checkBackBranchToSelf(DebugInfoInspector info) {
+ private void checkLocalsAtThrow(DebugInfoInspector info) {
info.checkStartLine(9);
info.checkLineHasExactLocals(9, "x", "int");
info.checkLineHasExactLocals(10, "x", "int", "a", "int");
diff --git a/src/test/java/com/android/tools/r8/desugar/BasicTestDependenciesDesugaringTest.java b/src/test/java/com/android/tools/r8/desugar/BasicTestDependenciesDesugaringTest.java
new file mode 100644
index 0000000..b6debff
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugar/BasicTestDependenciesDesugaringTest.java
@@ -0,0 +1,101 @@
+// Copyright (c) 2017, 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.desugar;
+
+import com.android.tools.r8.CompilationException;
+import com.android.tools.r8.D8Command;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.dex.Constants;
+import com.android.tools.r8.errors.CompilationError;
+import com.android.tools.r8.utils.OffOrAuto;
+import com.google.common.collect.Sets;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class BasicTestDependenciesDesugaringTest {
+
+ private static final String CLASSPATH_SEPARATOR = File.pathSeparator;
+
+ private static final String[] allLibs;
+ static {
+ try {
+ allLibs =
+ Files.readAllLines(Paths.get(ToolHelper.BUILD_DIR, "generated", "supportlibraries.txt"))
+ .toArray(new String[0]);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ private static Set<String> knownIssues = Sets.newHashSet(new String[]{
+ "espresso-core-3.0.0.jar",
+ "hamcrest-integration-1.3.jar",
+ "hamcrest-library-1.3.jar",
+ "junit-4.12.jar",
+ "support-core-ui-25.4.0.jar",
+ "support-media-compat-25.4.0.jar",
+ "support-fragment-25.4.0.jar",
+ "support-compat-25.4.0.jar"
+ });
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @Parameters(name = "{0}")
+ public static Collection<String[]> data() {
+ int libCount = allLibs.length;
+ Collection<String[]> datas = new ArrayList<String[]>(libCount);
+ for (int i = 0; i < libCount; i++) {
+ StringBuilder classpath = new StringBuilder();
+ for (int j = 0; j < libCount; j++) {
+ if (j != i) {
+ classpath.append(allLibs[j]).append(CLASSPATH_SEPARATOR);
+ }
+ }
+ datas.add(new String[] {new File(allLibs[i]).getName(), allLibs[i], classpath.toString()});
+ }
+ return datas;
+ }
+
+ private String name;
+ private Path toCompile;
+ private List<Path> classpath;
+
+ public BasicTestDependenciesDesugaringTest(String name, String toCompile, String classpath) {
+ this.name = name;
+ this.toCompile = Paths.get(toCompile);
+ this.classpath = Arrays.asList(classpath.split(CLASSPATH_SEPARATOR)).stream()
+ .map(string -> Paths.get(string)).collect(Collectors.toList());
+ }
+
+ @Test
+ public void testCompile() throws IOException, CompilationException {
+ if (knownIssues.contains(name)) {
+ thrown.expect(CompilationError.class);
+ }
+ ToolHelper.runD8(
+ D8Command.builder().addClasspathFiles(classpath)
+ .addProgramFiles(toCompile)
+ .addLibraryFiles(Paths.get(ToolHelper.getAndroidJar(Constants.ANDROID_K_API)))
+ .setMinApiLevel(Constants.ANDROID_K_API)
+ .build(),
+ options -> options.interfaceMethodDesugaring = OffOrAuto.Auto);
+ }
+}
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 4b2ee49..f7a9caa 100644
--- a/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
+++ b/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
@@ -3,6 +3,8 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.internal;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.android.tools.r8.CompilationException;
@@ -10,6 +12,7 @@
import com.android.tools.r8.D8Command;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.R8RunArtTestsTest.CompilerUnderTest;
+import com.android.tools.r8.Resource;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.dex.Constants;
import com.android.tools.r8.shaking.ProguardRuleParserException;
@@ -18,15 +21,20 @@
import com.android.tools.r8.utils.ArtErrorParser.ArtErrorInfo;
import com.android.tools.r8.utils.ArtErrorParser.ArtErrorParserException;
import com.android.tools.r8.utils.DexInspector;
+import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.ListUtils;
import com.android.tools.r8.utils.OutputMode;
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Closer;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
import org.junit.ComparisonFailure;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -45,7 +53,7 @@
String... inputs)
throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
return runAndCheckVerification(
- compiler, mode, referenceApk, pgMap, pgConf, Arrays.asList(inputs));
+ compiler, mode, referenceApk, pgMap, pgConf, null, Arrays.asList(inputs));
}
public AndroidApp runAndCheckVerification(D8Command command, String referenceApk)
@@ -59,6 +67,7 @@
String referenceApk,
String pgMap,
String pgConf,
+ Consumer<InternalOptions> optionsConsumer,
List<String> inputs)
throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
assertTrue(referenceApk == null || new File(referenceApk).exists());
@@ -77,6 +86,9 @@
options -> {
options.printSeeds = false;
options.minApiLevel = Constants.ANDROID_L_API;
+ if (optionsConsumer != null) {
+ optionsConsumer.accept(options);
+ }
});
} else {
assert compiler == CompilerUnderTest.D8;
@@ -126,4 +138,38 @@
"PROCESSED\n" + error.dump(ours, true) + "\nEND PROCESSED");
}
}
+
+ public int applicationSize(AndroidApp app) throws IOException {
+ int bytes = 0;
+ try (Closer closer = Closer.create()) {
+ for (Resource dex : app.getDexProgramResources()) {
+ bytes += ByteStreams.toByteArray(closer.register(dex.getStream())).length;
+ }
+ }
+ return bytes;
+ }
+
+ public void assertIdenticalApplications(AndroidApp app1, AndroidApp app2) throws IOException {
+ assertIdenticalApplications(app1, app2, false);
+ }
+
+ public void assertIdenticalApplications(AndroidApp app1, AndroidApp app2, boolean write)
+ throws IOException {
+ try (Closer closer = Closer.create()) {
+ if (write) {
+ app1.writeToDirectory(Paths.get("app1"), OutputMode.Indexed);
+ app2.writeToDirectory(Paths.get("app2"), OutputMode.Indexed);
+ }
+ List<Resource> files1 = app1.getDexProgramResources();
+ List<Resource> files2 = app2.getDexProgramResources();
+ assertEquals(files1.size(), files2.size());
+ for (int index = 0; index < files1.size(); index++) {
+ InputStream file1 = closer.register(files1.get(index).getStream());
+ InputStream file2 = closer.register(files2.get(index).getStream());
+ byte[] bytes1 = ByteStreams.toByteArray(file1);
+ byte[] bytes2 = ByteStreams.toByteArray(file2);
+ assertArrayEquals("File index " + index, bytes1, bytes2);
+ }
+ }
+ }
}
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 0a2cdae..1f37499 100644
--- a/src/test/java/com/android/tools/r8/internal/GMSCoreDeployJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/GMSCoreDeployJarVerificationTest.java
@@ -7,15 +7,29 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.R8RunArtTestsTest.CompilerUnderTest;
import com.android.tools.r8.shaking.ProguardRuleParserException;
+import com.android.tools.r8.utils.AndroidApp;
+import com.android.tools.r8.utils.InternalOptions;
import java.io.IOException;
+import java.util.Collections;
import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
public class GMSCoreDeployJarVerificationTest extends GMSCoreCompilationTestBase {
- public void buildFromDeployJar(
+ public AndroidApp buildFromDeployJar(
CompilerUnderTest compiler, CompilationMode mode, String base, boolean hasReference)
throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
- runAndCheckVerification(
+ return runAndCheckVerification(
compiler, mode, hasReference ? base + REFERENCE_APK : null, null, null, base + DEPLOY_JAR);
}
+
+
+ public AndroidApp buildFromDeployJar(
+ CompilerUnderTest compiler, CompilationMode mode, String base, boolean hasReference,
+ Consumer<InternalOptions> optionsConsumer)
+ throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
+ return runAndCheckVerification(
+ compiler, mode, hasReference ? base + REFERENCE_APK : null, null, null,
+ optionsConsumer, Collections.singletonList(base + DEPLOY_JAR));
+ }
}
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java
index fc9ee3f..bc3d758 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreDeterministicTest.java
@@ -3,22 +3,15 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.internal;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
import com.android.tools.r8.CompilationException;
import com.android.tools.r8.R8Command;
-import com.android.tools.r8.Resource;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.dex.Constants;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.shaking.ProguardRuleParserException;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.OutputMode;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Closer;
import java.io.IOException;
-import java.io.InputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
@@ -56,24 +49,13 @@
AndroidApp app1 = doRun();
AndroidApp app2 = doRun();
- // Verify that the result of the two compilations was the same.
- try (Closer closer = Closer.create()) {
- List<Resource> files1 = app1.getDexProgramResources();
- List<Resource> files2 = app2.getDexProgramResources();
- assertEquals(files1.size(), files2.size());
- for (int index = 0; index < files1.size(); index++) {
- InputStream file1 = closer.register(files1.get(index).getStream());
- InputStream file2 = closer.register(files2.get(index).getStream());
- byte[] bytes1 = ByteStreams.toByteArray(file1);
- byte[] bytes2 = ByteStreams.toByteArray(file2);
- assertArrayEquals("File index " + index, bytes1, bytes2);
- }
- }
-
// Check that the generated bytecode runs through the dex2oat verifier with no errors.
Path combinedInput = temp.getRoot().toPath().resolve("all.jar");
Path oatFile = temp.getRoot().toPath().resolve("all.oat");
app1.writeToZip(combinedInput, OutputMode.Indexed);
ToolHelper.runDex2Oat(combinedInput, oatFile);
+
+ // Verify that the result of the two compilations was the same.
+ assertIdenticalApplications(app1, app2);
}
}
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreTreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreTreeShakeJarVerificationTest.java
index fa193d4..efa812a 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreTreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreTreeShakeJarVerificationTest.java
@@ -10,17 +10,17 @@
import com.android.tools.r8.R8RunArtTestsTest.CompilerUnderTest;
import com.android.tools.r8.shaking.ProguardRuleParserException;
import com.android.tools.r8.utils.AndroidApp;
-import com.android.tools.r8.Resource;
+import com.android.tools.r8.utils.InternalOptions;
import com.google.common.collect.ImmutableList;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Closer;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
public class R8GMSCoreTreeShakeJarVerificationTest extends GMSCoreCompilationTestBase {
- public void buildAndTreeShakeFromDeployJar(
- CompilationMode mode, String base, boolean hasReference, int maxSize)
+ public AndroidApp buildAndTreeShakeFromDeployJar(
+ CompilationMode mode, String base, boolean hasReference, int maxSize,
+ Consumer<InternalOptions> optionsConsumer)
throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
AndroidApp app = runAndCheckVerification(
CompilerUnderTest.R8,
@@ -28,15 +28,12 @@
hasReference ? base + REFERENCE_APK : null,
null,
base + PG_CONF,
+ optionsConsumer,
// Don't pass any inputs. The input will be read from the -injars in the Proguard
// configuration file.
ImmutableList.of());
- int bytes = 0;
- try (Closer closer = Closer.create()) {
- for (Resource dex : app.getDexProgramResources()) {
- bytes += ByteStreams.toByteArray(closer.register(dex.getStream())).length;
- }
- }
+ int bytes = applicationSize(app);
assertTrue("Expected max size of " + maxSize + ", got " + bytes, bytes < maxSize);
+ return app;
}
}
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 6118b3d..dc2acae 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
@@ -8,6 +8,7 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.R8RunArtTestsTest.CompilerUnderTest;
import com.android.tools.r8.shaking.ProguardRuleParserException;
+import com.android.tools.r8.utils.AndroidApp;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import org.junit.Test;
@@ -18,8 +19,17 @@
public void buildFromDeployJar()
// TODO(tamaskenez): set hasReference = true when we have the noshrink file for V10
throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
- buildFromDeployJar(
+ AndroidApp app1 = buildFromDeployJar(
CompilerUnderTest.R8, CompilationMode.RELEASE,
GMSCoreCompilationTestBase.GMSCORE_V10_DIR, false);
+ // TODO(sgjesse): Re-enable the deterministic test part when output is stable.
+ if (false) {
+ AndroidApp app2 = buildFromDeployJar(
+ CompilerUnderTest.R8, CompilationMode.RELEASE,
+ GMSCoreCompilationTestBase.GMSCORE_V10_DIR, false);
+
+ // Verify that the result of the two compilations was the same.
+ assertIdenticalApplications(app1, app2);
+ }
}
}
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java
index 9572825..766de9d 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10TreeShakeJarVerificationTest.java
@@ -3,21 +3,37 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.internal;
-import com.android.tools.r8.CompilationException;
import com.android.tools.r8.CompilationMode;
-import com.android.tools.r8.shaking.ProguardRuleParserException;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
+import com.android.tools.r8.utils.AndroidApp;
+import com.android.tools.r8.utils.InternalOptions;
import org.junit.Test;
public class R8GMSCoreV10TreeShakeJarVerificationTest
extends R8GMSCoreTreeShakeJarVerificationTest {
@Test
- public void buildAndTreeShakeFromDeployJar()
- throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
+ public void buildAndTreeShakeFromDeployJar() throws Exception {
// TODO(tamaskenez): set hasReference = true when we have the noshrink file for V10
buildAndTreeShakeFromDeployJar(
- CompilationMode.RELEASE, GMSCORE_V10_DIR, false, GMSCORE_V10_MAX_SIZE);
+ CompilationMode.RELEASE, GMSCORE_V10_DIR, false, GMSCORE_V10_MAX_SIZE, null);
+ }
+
+ private void configureDeterministic(InternalOptions options) {
+ options.skipMinification = true;
+ }
+
+ @Test
+ public void deterministic() throws Exception {
+ // TODO(sgjesse): When minification is deterministic remove this test and make the one above
+ // check for deterministic output.
+ AndroidApp app1 = buildAndTreeShakeFromDeployJar(
+ CompilationMode.RELEASE, GMSCORE_V10_DIR, false, GMSCORE_V10_MAX_SIZE + 2000000,
+ this::configureDeterministic);
+ AndroidApp app2 = buildAndTreeShakeFromDeployJar(
+ CompilationMode.RELEASE, GMSCORE_V10_DIR, false, GMSCORE_V10_MAX_SIZE + 2000000,
+ this::configureDeterministic);
+
+ // Verify that the result of the two compilations was the same.
+ assertIdenticalApplications(app1, app2);
}
}
diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV9TreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV9TreeShakeJarVerificationTest.java
index 78aa1a3..df7944f 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV9TreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV9TreeShakeJarVerificationTest.java
@@ -16,6 +16,6 @@
public void buildAndTreeShakeFromDeployJar()
throws ExecutionException, IOException, ProguardRuleParserException, CompilationException {
buildAndTreeShakeFromDeployJar(
- CompilationMode.RELEASE, GMSCORE_V9_DIR, true, GMSCORE_V9_MAX_SIZE);
+ CompilationMode.RELEASE, GMSCORE_V9_DIR, true, GMSCORE_V9_MAX_SIZE, null);
}
}
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeTreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/YouTubeTreeShakeJarVerificationTest.java
index 8ee3674..3b42d0e 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeTreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeTreeShakeJarVerificationTest.java
@@ -30,6 +30,7 @@
BASE + APK,
null,
BASE + PG_CONF,
+ null,
// Don't pass any inputs. The input will be read from the -injars in the Proguard
// configuration file.
ImmutableList.of());
diff --git a/src/test/java/com/android/tools/r8/jasmin/JumboStringTests.java b/src/test/java/com/android/tools/r8/jasmin/JumboStringTests.java
new file mode 100644
index 0000000..d0ade31
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/jasmin/JumboStringTests.java
@@ -0,0 +1,106 @@
+// Copyright (c) 2017, 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.jasmin;
+
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.debuginfo.DebugInfoInspector;
+import com.android.tools.r8.dex.Constants;
+import com.android.tools.r8.naming.MemberNaming.MethodSignature;
+import com.android.tools.r8.utils.AndroidApp;
+import com.android.tools.r8.utils.DexInspector;
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class JumboStringTests extends JasminTestBase {
+
+ // String constants are split into several class files to ensure both the constant-pool and
+ // instruction count are below the class-file limits.
+ private static int CLASSES_COUNT = 10;
+ private static int MIN_STRING_COUNT = Constants.FIRST_JUMBO_INDEX + 1;
+ private static int EXTRA_STRINGS_PER_CLASSES_COUNT = MIN_STRING_COUNT % CLASSES_COUNT;
+ private static int STRINGS_PER_CLASSES_COUNT =
+ EXTRA_STRINGS_PER_CLASSES_COUNT + MIN_STRING_COUNT / CLASSES_COUNT;
+
+ @Test
+ @Ignore("b/35701208")
+ public void test() throws Exception {
+ JasminBuilder builder = new JasminBuilder();
+ LinkedHashMap<String, MethodSignature> classes = new LinkedHashMap<>(CLASSES_COUNT);
+ for (int i = 0; i < CLASSES_COUNT; i++) {
+ JasminBuilder.ClassBuilder clazz = builder.addClass("Test" + i);
+ List<String> lines = new ArrayList<>(STRINGS_PER_CLASSES_COUNT + 100);
+ lines.addAll(
+ ImmutableList.of(
+ ".limit locals 3",
+ ".limit stack 4",
+ ".var 0 is this LTest; from L0 to L2",
+ ".var 1 is i I from L0 to L2",
+ ".var 2 is strings [Ljava/lang/String; from L1 to L2",
+ "L0:",
+ ".line 1",
+ " ldc " + STRINGS_PER_CLASSES_COUNT,
+ " anewarray java/lang/String",
+ " astore 2",
+ "L1:",
+ ".line 2"));
+ for (int j = 0; j < STRINGS_PER_CLASSES_COUNT; j++) {
+ lines.add(" aload 2");
+ lines.add(" ldc " + j);
+ lines.add(" ldc \"string" + i + "_" + j + "\"");
+ lines.add(" aastore");
+ }
+ lines.addAll(
+ ImmutableList.of(
+ "L2:",
+ " .line 3",
+ " aload 2",
+ " iload 1",
+ " aaload",
+ " checkcast java/lang/String",
+ " areturn"));
+ MethodSignature foo =
+ clazz.addVirtualMethod(
+ "foo", ImmutableList.of("I"), "Ljava/lang/String;", lines.toArray(new String[0]));
+ classes.put(clazz.name, foo);
+ }
+
+ JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
+ clazz.addMainMethod(
+ ".limit stack 3",
+ ".limit locals 1",
+ " new Test0",
+ " dup",
+ " invokespecial Test0/<init>()V",
+ " ldc 42",
+ " invokevirtual Test0/foo(I)Ljava/lang/String;",
+ " getstatic java/lang/System/out Ljava/io/PrintStream;",
+ " swap",
+ " invokevirtual java/io/PrintStream/print(Ljava/lang/String;)V",
+ " return");
+
+ String expected = "string0_42";
+ assertEquals(expected, runOnJava(builder, clazz.name));
+
+ AndroidApp jasminApp = builder.build();
+ AndroidApp d8App = ToolHelper.runD8(jasminApp);
+ assertEquals(expected, runOnArt(d8App, clazz.name));
+
+ DexInspector inspector = new DexInspector(d8App);
+ for (Entry<String, MethodSignature> entry : classes.entrySet()) {
+ DebugInfoInspector info = new DebugInfoInspector(inspector, entry.getKey(), entry.getValue());
+ info.checkStartLine(1);
+ // If jumbo-string processing fails to keep debug info, some methods will have lost 'i' here.
+ info.checkLineHasExactLocals(1, "this", entry.getKey(), "i", "int");
+ info.checkLineHasExactLocals(
+ 2, "this", entry.getKey(), "i", "int", "strings", "java.lang.String[]");
+ }
+ }
+}
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 f8ca2a8..dfc20f9 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
@@ -6,43 +6,45 @@
import static org.junit.Assert.assertEquals;
+import com.android.tools.r8.CompilationException;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.utils.FileUtils;
import com.google.common.collect.ImmutableList;
import java.nio.file.Path;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
public class MainDexListOutputTest extends TestBase {
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
@Test
public void testNoMainDex() throws Exception {
- Path mainDexList = temp.newFile().toPath();
- compileWithR8(ImmutableList.of(HelloWorldMain.class),
- options -> {
- options.printMainDexList = true;
- options.printMainDexListFile = mainDexList;
- });
- // Empty main dex list.
- assertEquals(0, FileUtils.readTextFile(mainDexList).size());
+ thrown.expect(CompilationException.class);
+ Path mainDexListOutput = temp.getRoot().toPath().resolve("main-dex-output.txt");
+ R8Command command =
+ ToolHelper.prepareR8CommandBuilder(readClasses(HelloWorldMain.class))
+ .setMainDexListOutputPath(mainDexListOutput)
+ .build();
+ ToolHelper.runR8(command);
}
@Test
public void testWithMainDex() throws Exception {
Path mainDexRules = writeTextToTempFile(keepMainProguardConfiguration(HelloWorldMain.class));
+ Path mainDexListOutput = temp.getRoot().toPath().resolve("main-dex-output.txt");
R8Command command =
ToolHelper.prepareR8CommandBuilder(readClasses(HelloWorldMain.class))
.addMainDexRules(mainDexRules)
+ .setMainDexListOutputPath(mainDexListOutput)
.build();
- Path mainDexList = temp.newFile().toPath();
- ToolHelper.runR8(command,
- options -> {
- options.printMainDexList = true;
- options.printMainDexListFile = mainDexList;
- });
+ ToolHelper.runR8(command);
// Main dex list with the single class.
assertEquals(
ImmutableList.of(HelloWorldMain.class.getTypeName().replace('.', '/') + ".class"),
- FileUtils.readTextFile(mainDexList));
+ FileUtils.readTextFile(mainDexListOutput));
}
}
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java
index a5e2309..55f98d8 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java
@@ -5,6 +5,7 @@
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -16,6 +17,7 @@
import com.android.tools.r8.dex.ApplicationWriter;
import com.android.tools.r8.dex.Constants;
import com.android.tools.r8.errors.CompilationError;
+import com.android.tools.r8.errors.MainDexError;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.AppInfoWithSubtyping;
import com.android.tools.r8.graph.Code;
@@ -157,7 +159,8 @@
// Make sure {@link MonoDexDistributor} was _not_ used.
assertFalse(e.getMessage().contains("single dex file"));
// Make sure what exceeds the limit is the number of methods.
- assertTrue(e.getMessage().contains("# methods"));
+ assertTrue(e.getMessage().contains("# methods: "
+ + String.valueOf(TWO_LARGE_CLASSES.size() * MAX_METHOD_COUNT)));
}
}
@@ -197,7 +200,8 @@
// Make sure {@link MonoDexDistributor} was _not_ used.
assertFalse(e.getMessage().contains("single dex file"));
// Make sure what exceeds the limit is the number of methods.
- assertTrue(e.getMessage().contains("# methods"));
+ assertTrue(e.getMessage().contains("# methods: "
+ + String.valueOf(MANY_CLASSES_COUNT * MANY_CLASSES_MULTI_DEX_METHODS_PER_CLASS)));
}
}
@@ -213,7 +217,9 @@
FileUtils.writeTextFile(mainDexList, list);
Set<DexType> types = MainDexList.parse(mainDexList, factory);
for (String entry : list) {
- assertTrue(types.contains(factory.createType("L" + entry.replace(".class", "") + ";")));
+ DexType type = factory.createType("L" + entry.replace(".class", "") + ";");
+ assertTrue(types.contains(type));
+ assertSame(type, MainDexList.parse(entry, factory));
}
}
@@ -229,7 +235,7 @@
@Test
public void checkDeterminism() throws Exception {
// Synthesize a dex containing a few empty classes including some in the default package.
- // Everything can fit easaly in a single dex file.
+ // Everything can fit easily in a single dex file.
String[] classes = {
"A",
"B",
@@ -283,7 +289,7 @@
}
addMainListFile(mainLists, mainList);
- // Same in reverese order
+ // Same in reverse order
addMainListFile(mainLists, Lists.reverse(mainList));
// Mixed partial list.
@@ -309,7 +315,7 @@
.addProgramFiles(input)
.setOutputPath(out);
if (mainLists.get(i) != null) {
- builder.setMainDexListFile(mainLists.get(i));
+ builder.addMainDexListFiles(mainLists.get(i));
}
ToolHelper.runD8(builder.build());
}
@@ -347,11 +353,12 @@
generateApplication(
MANY_CLASSES, Constants.ANDROID_K_API, false, MANY_CLASSES_MULTI_DEX_METHODS_PER_CLASS);
fail("Expect to fail, for there are many classes while multidex is not enabled.");
- } catch (CompilationError e) {
+ } catch (MainDexError e) {
// Make sure {@link MonoDexDistributor} was used.
assertTrue(e.getMessage().contains("single dex file"));
// Make sure what exceeds the limit is the number of methods.
- assertTrue(e.getMessage().contains("# methods"));
+ assertTrue(e.getMessage().contains("# methods: "
+ + String.valueOf(MANY_CLASSES_COUNT * MANY_CLASSES_MULTI_DEX_METHODS_PER_CLASS)));
}
}
@@ -394,8 +401,16 @@
}
}
+ private enum MultiDexTestMode {
+ SINGLE_FILE,
+ MULTIPLE_FILES,
+ STRINGS,
+ FILES_AND_STRINGS
+ }
+
private void doVerifyMainDexContains(
- List<String> mainDex, Path app, boolean singleDexApp, boolean minimalMainDex)
+ List<String> mainDex, Path app, boolean singleDexApp, boolean minimalMainDex,
+ MultiDexTestMode testMode)
throws IOException, CompilationException, ExecutionException, ProguardRuleParserException {
AndroidApp originalApp = AndroidApp.fromProgramFiles(app);
DexInspector originalInspector = new DexInspector(originalApp);
@@ -404,18 +419,57 @@
originalInspector.clazz(clazz).isPresent());
}
Path outDir = temp.newFolder().toPath();
- Path mainDexList = temp.newFile().toPath();
- FileUtils.writeTextFile(mainDexList, ListUtils.map(mainDex, MainDexListTests::typeToEntry));
- R8Command command =
+ R8Command.Builder builder =
R8Command.builder()
.addProgramFiles(app)
- .setMainDexListFile(mainDexList)
- .setMinimalMainDex(minimalMainDex)
+ .setMinimalMainDex(minimalMainDex && mainDex.size() > 0)
.setOutputPath(outDir)
.setTreeShaking(false)
- .setMinification(false)
- .build();
- ToolHelper.runR8(command);
+ .setMinification(false);
+
+ switch (testMode) {
+ case SINGLE_FILE:
+ Path mainDexList = temp.newFile().toPath();
+ FileUtils.writeTextFile(mainDexList, ListUtils.map(mainDex, MainDexListTests::typeToEntry));
+ builder.addMainDexListFiles(mainDexList);
+ break;
+ case MULTIPLE_FILES: {
+ // Partion the main dex list into several files.
+ List<List<String>> partitions = Lists.partition(mainDex, Math.max(mainDex.size() / 3, 1));
+ List<Path> mainDexListFiles = new ArrayList<>();
+ for (List<String> partition : partitions) {
+ Path partialMainDexList = temp.newFile().toPath();
+ FileUtils.writeTextFile(partialMainDexList,
+ ListUtils.map(partition, MainDexListTests::typeToEntry));
+ mainDexListFiles.add(partialMainDexList);
+ }
+ builder.addMainDexListFiles(mainDexListFiles);
+ break;
+ }
+ case STRINGS:
+ builder.addMainDexClasses(mainDex);
+ break;
+ case FILES_AND_STRINGS: {
+ // Partion the main dex list add some parts through files and the other parts using strings.
+ List<List<String>> partitions = Lists.partition(mainDex, Math.max(mainDex.size() / 3, 1));
+ List<Path> mainDexListFiles = new ArrayList<>();
+ for (int i = 0; i < partitions.size(); i++) {
+ List<String> partition = partitions.get(i);
+ if (i % 2 == 0) {
+ Path partialMainDexList = temp.newFile().toPath();
+ FileUtils.writeTextFile(partialMainDexList,
+ ListUtils.map(partition, MainDexListTests::typeToEntry));
+ mainDexListFiles.add(partialMainDexList);
+ } else {
+ builder.addMainDexClasses(mainDex);
+ }
+ }
+ builder.addMainDexListFiles(mainDexListFiles);
+ break;
+ }
+ }
+
+ ToolHelper.runR8(builder.build());
if (!singleDexApp && !minimalMainDex) {
assertTrue("Output run only produced one dex file.",
1 < Files.list(outDir).filter(FileUtils::isDexFile).count());
@@ -434,8 +488,10 @@
private void verifyMainDexContains(List<String> mainDex, Path app, boolean singleDexApp)
throws Throwable {
- doVerifyMainDexContains(mainDex, app, singleDexApp, false);
- doVerifyMainDexContains(mainDex, app, singleDexApp, true);
+ for (MultiDexTestMode multiDexTestMode : MultiDexTestMode.values()) {
+ doVerifyMainDexContains(mainDex, app, singleDexApp, false, multiDexTestMode);
+ doVerifyMainDexContains(mainDex, app, singleDexApp, true, multiDexTestMode);
+ }
}
public static AndroidApp generateApplication(List<String> classes, int minApi, int methodCount)
diff --git a/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java b/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java
index 47c6330..89f0f3b 100644
--- a/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java
@@ -74,6 +74,8 @@
.addLibraryFiles(Paths.get(ANDROID_JAR))
.build();
ToolHelper.runR8(command, options -> {
+ // Disable inlining to make this test not depend on inlining decisions.
+ options.inlineAccessors = false;
options.printUsage = true;
options.printUsageFile = out.resolve(test + PRINT_USAGE_FILE_SUFFIX);
});
@@ -151,10 +153,12 @@
}
private static void inspectShaking9(PrintUsageInspector inspector) {
- assertFalse(inspector.clazz("shaking9.Superclass").isPresent());
+ Optional<ClassSubject> superClass = inspector.clazz("shaking9.Superclass");
+ assertFalse(superClass.isPresent());
Optional<ClassSubject> subClass = inspector.clazz("shaking9.Subclass");
assertTrue(subClass.isPresent());
assertTrue(subClass.get().method("void", "aMethod", Collections.emptyList()));
+ assertFalse(subClass.get().method("void", "<init>", Collections.emptyList()));
}
private static void inspectShaking12(PrintUsageInspector inspector) {
diff --git a/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java b/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java
index 242a7d5..ad1a392 100644
--- a/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java
@@ -66,6 +66,12 @@
VALID_PROGUARD_DIR + "overloadaggressively.flags";
private static final String DONT_OPTIMIZE =
VALID_PROGUARD_DIR + "dontoptimize.flags";
+ private static final String DONT_OPTIMIZE_OVERRIDES_PASSES =
+ VALID_PROGUARD_DIR + "dontoptimize-overrides-optimizationpasses.flags";
+ private static final String OPTIMIZATION_PASSES =
+ VALID_PROGUARD_DIR + "optimizationpasses.flags";
+ private static final String OPTIMIZATION_PASSES_WITHOUT_N =
+ INVALID_PROGUARD_DIR + "optimizationpasses-without-n.flags";
private static final String SKIP_NON_PUBLIC_LIBRARY_CLASSES =
VALID_PROGUARD_DIR + "skipnonpubliclibraryclasses.flags";
private static final String PARSE_AND_SKIP_SINGLE_ARGUMENT =
@@ -357,10 +363,40 @@
}
@Test
- public void parseDontOptimize()
- throws IOException, ProguardRuleParserException {
+ public void parseDontOptimize() throws IOException, ProguardRuleParserException {
ProguardConfigurationParser parser = new ProguardConfigurationParser(new DexItemFactory());
parser.parse(Paths.get(DONT_OPTIMIZE));
+ ProguardConfiguration config = parser.getConfig();
+ assertTrue(config.getOptimizationPasses() == 0);
+ }
+
+ @Test
+ public void parseDontOptimizeOverridesPasses() throws IOException, ProguardRuleParserException {
+ ProguardConfigurationParser parser = new ProguardConfigurationParser(new DexItemFactory());
+ parser.parse(Paths.get(DONT_OPTIMIZE_OVERRIDES_PASSES));
+ ProguardConfiguration config = parser.getConfig();
+ assertTrue(config.getOptimizationPasses() == 0);
+ }
+
+ @Test
+ public void parseOptimizationPasses() throws IOException, ProguardRuleParserException {
+ ProguardConfigurationParser parser = new ProguardConfigurationParser(new DexItemFactory());
+ parser.parse(Paths.get(OPTIMIZATION_PASSES));
+ ProguardConfiguration config = parser.getConfig();
+ // TODO(b/36800551): optimizationPasses should not be set at the moment.
+ // assertTrue(config.getOptimizationPasses() == 8);
+ assertTrue(config.getOptimizationPasses() == 1);
+ }
+
+ @Test
+ public void parseOptimizationPassesError() throws IOException, ProguardRuleParserException {
+ try {
+ ProguardConfigurationParser parser = new ProguardConfigurationParser(new DexItemFactory());
+ parser.parse(Paths.get(OPTIMIZATION_PASSES_WITHOUT_N));
+ fail();
+ } catch (ProguardRuleParserException e) {
+ assertTrue(e.getMessage().contains("Missing n"));
+ }
}
@Test
diff --git a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
index 5b94e6b..99be74a 100644
--- a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
@@ -73,8 +73,12 @@
"minifygeneric:keep-rules.txt:DEX:false",
"minifygeneric:keep-rules.txt:JAR:false",
"minifygenericwithinner:keep-rules.txt:DEX:false",
- "minifygenericwithinner:keep-rules.txt:JAR:false"
-
+ "minifygenericwithinner:keep-rules.txt:JAR:false",
+ // TODO(62048823): Inlining tests don't use allowaccessmodification.
+ "inlining:keep-rules.txt:DEX:true",
+ "inlining:keep-rules.txt:JAR:true",
+ "inlining:keep-rules-discard.txt:DEX:true",
+ "inlining:keep-rules-discard.txt:JAR:true"
);
private final boolean minify;
@@ -368,6 +372,80 @@
subclass.method("double", "anotherMethod", ImmutableList.of("double")).isPresent());
}
+ private static void simpleproto1UnusedFieldIsGone(DexInspector inspector) {
+ ClassSubject protoClass = inspector.clazz("simpleproto1.GeneratedSimpleProto$Simple");
+ Assert.assertTrue(protoClass.isPresent());
+ Assert.assertFalse(protoClass.field("boolean", "other_").isPresent());
+ }
+
+ private static void simpleproto2UnusedFieldsAreGone(DexInspector inspector) {
+ ClassSubject protoClass = inspector.clazz("simpleproto2.GeneratedSimpleProto$Simple");
+ Assert.assertTrue(protoClass.isPresent());
+ Assert.assertFalse(protoClass.field("int", "id_").isPresent());
+ Assert.assertFalse(protoClass.field("float", "hasMe_").isPresent());
+ Assert.assertFalse(protoClass.field("int", "other_").isPresent());
+ }
+
+ private static void nestedproto1UnusedFieldsAreGone(DexInspector inspector) {
+ ClassSubject protoClass = inspector.clazz("nestedproto1.GeneratedNestedProto$Outer");
+ Assert.assertTrue(protoClass.isPresent());
+ Assert.assertFalse(protoClass.field("int", "id_").isPresent());
+ Assert.assertTrue(
+ protoClass.field("nestedproto1.GeneratedNestedProto$NestedOne", "inner_").isPresent());
+ Assert.assertFalse(
+ protoClass.field("nestedproto1.GeneratedNestedProto$NestedTwo", "inner2_").isPresent());
+ ClassSubject nestedOne = inspector.clazz("nestedproto1.GeneratedNestedProto$NestedOne");
+ Assert.assertTrue(nestedOne.isPresent());
+ Assert.assertTrue(nestedOne.field("java.lang.String", "other_").isPresent());
+ Assert.assertFalse(nestedOne.field("int", "id_").isPresent());
+ Assert.assertFalse(inspector.clazz("nestedproto1.GeneratedNestedProto$NestedTwo").isPresent());
+ }
+
+ private static void nestedproto2UnusedFieldsAreGone(DexInspector inspector) {
+ ClassSubject protoClass = inspector.clazz("nestedproto2.GeneratedNestedProto$Outer");
+ Assert.assertTrue(protoClass.isPresent());
+ Assert.assertTrue(protoClass.field("int", "id_").isPresent());
+ Assert.assertFalse(
+ protoClass.field("nestedproto2.GeneratedNestedProto$NestedOne", "inner_").isPresent());
+ Assert.assertFalse(
+ protoClass.field("nestedproto2.GeneratedNestedProto$NestedTwo", "inner2_").isPresent());
+ Assert.assertFalse(inspector.clazz("nestedproto2.GeneratedNestedProto$NestedOne").isPresent());
+ Assert.assertFalse(inspector.clazz("nestedproto2.GeneratedNestedProto$NestedTwo").isPresent());
+ }
+
+
+ private static void enumprotoUnusedFieldsAreGone(DexInspector inspector) {
+ ClassSubject protoClass = inspector.clazz("enumproto.GeneratedEnumProto$Enum");
+ Assert.assertTrue(protoClass.isPresent());
+ Assert.assertFalse(protoClass.field("int", "id_").isPresent());
+ Assert.assertTrue(protoClass.field("int", "enum_").isPresent());
+ Assert.assertFalse(protoClass.field("int", "other_").isPresent());
+ ClassSubject protoThreeClass = inspector.clazz("enumproto.three.GeneratedEnumProto$EnumThree");
+ Assert.assertTrue(protoThreeClass.isPresent());
+ Assert.assertFalse(protoThreeClass.field("int", "id_").isPresent());
+ Assert.assertTrue(protoThreeClass.field("int", "enum_").isPresent());
+ Assert.assertFalse(protoThreeClass.field("int", "other_").isPresent());
+ }
+
+ private static void repeatedUnusedFieldsAreGone(DexInspector inspector) {
+ ClassSubject protoClass = inspector.clazz("repeatedproto.GeneratedRepeatedProto$Repeated");
+ Assert.assertTrue(protoClass.isPresent());
+ Assert.assertFalse(protoClass.field("int", "id_").isPresent());
+ Assert.assertTrue(
+ protoClass.field("com.google.protobuf.Internal$ProtobufList", "repeated_").isPresent());
+ Assert.assertFalse(
+ protoClass.field("com.google.protobuf.Internal$ProtobufList", "sub_").isPresent());
+ Assert.assertFalse(
+ protoClass.field("com.google.protobuf.Internal$BooleanList", "other_").isPresent());
+ }
+
+ private static void oneofprotoUnusedFieldsAreGone(DexInspector inspector) {
+ ClassSubject protoClass = inspector.clazz("oneofproto.GeneratedOneOfProto$Oneof");
+ Assert.assertTrue(protoClass.isPresent());
+ Assert.assertFalse(protoClass.field("int", "id_").isPresent());
+ Assert.assertFalse(protoClass.field("Object", "otherfields_").isPresent());
+ }
+
private static List<String> names =
ImmutableList.of("pqr", "vw$", "abc", "def", "stu", "ghi", "jkl", "ea", "xyz_", "mno");
@@ -553,7 +631,15 @@
"assumevalues5",
"annotationremoval",
"memberrebinding2",
- "memberrebinding3");
+ "memberrebinding3",
+ "simpleproto1",
+ "simpleproto2",
+ "simpleproto3",
+ "nestedproto1",
+ "nestedproto2",
+ "enumproto",
+ "repeatedproto",
+ "oneofproto");
// Keys can be the name of the test or the name of the test followed by a colon and the name
// of the keep file.
@@ -610,6 +696,20 @@
inspections
.put("annotationremoval:keep-rules-keep-innerannotation.txt",
TreeShakingTest::annotationRemovalHasAllInnerClassAnnotations);
+ inspections
+ .put("simpleproto1:keep-rules.txt", TreeShakingTest::simpleproto1UnusedFieldIsGone);
+ inspections
+ .put("simpleproto2:keep-rules.txt", TreeShakingTest::simpleproto2UnusedFieldsAreGone);
+ inspections
+ .put("nestedproto1:keep-rules.txt", TreeShakingTest::nestedproto1UnusedFieldsAreGone);
+ inspections
+ .put("nestedproto2:keep-rules.txt", TreeShakingTest::nestedproto2UnusedFieldsAreGone);
+ inspections
+ .put("enumproto:keep-rules.txt", TreeShakingTest::enumprotoUnusedFieldsAreGone);
+ inspections
+ .put("repeatedproto:keep-rules.txt", TreeShakingTest::repeatedUnusedFieldsAreGone);
+ inspections
+ .put("oneofproto:keep-rules.txt", TreeShakingTest::oneofprotoUnusedFieldsAreGone);
// Keys can be the name of the test or the name of the test followed by a colon and the name
// of the keep file.
@@ -775,7 +875,7 @@
Collections.singletonList(generated.toString()), mainClass, extraArtArgs, null);
outputComparator.accept(output1, output2);
} else {
- ToolHelper.checkArtOutputIdentical(Collections.singletonList(originalDex),
+ String output = ToolHelper.checkArtOutputIdentical(Collections.singletonList(originalDex),
Collections.singletonList(generated.toString()), mainClass,
extraArtArgs, null);
}
diff --git a/src/test/java/com/android/tools/r8/smali/OutlineTest.java b/src/test/java/com/android/tools/r8/smali/OutlineTest.java
index 4808f33..4656cd6 100644
--- a/src/test/java/com/android/tools/r8/smali/OutlineTest.java
+++ b/src/test/java/com/android/tools/r8/smali/OutlineTest.java
@@ -43,6 +43,13 @@
public class OutlineTest extends SmaliTestBase {
+ private InternalOptions createInternalOptions() {
+ InternalOptions result = new InternalOptions();
+ // Disable inlining to make sure that code looks as expected.
+ result.inlineAccessors = false;
+ return result;
+ }
+
DexEncodedMethod getInvokedMethod(DexApplication application, InvokeStatic invoke) {
DexInspector inspector = new DexInspector(application);
ClassSubject clazz = inspector.clazz(invoke.getMethod().holder.toSourceString());
@@ -118,7 +125,7 @@
);
for (int i = 2; i < 6; i++) {
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = i;
options.outline.maxSize = i;
@@ -183,7 +190,7 @@
);
for (int i = 2; i < 6; i++) {
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = i;
options.outline.maxSize = i;
@@ -249,7 +256,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
DexApplication originalApplication = buildApplication(builder, options);
DexApplication processedApplication = processApplication(originalApplication, options);
@@ -313,7 +320,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
DexApplication originalApplication = buildApplication(builder, options);
DexApplication processedApplication = processApplication(originalApplication, options);
@@ -372,7 +379,7 @@
);
for (int i = 2; i < 4; i++) {
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = i;
options.outline.maxSize = i;
@@ -446,7 +453,7 @@
);
for (int i = 2; i < 4; i++) {
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = i;
options.outline.maxSize = i;
@@ -516,7 +523,7 @@
);
for (int i = 2; i < 6; i++) {
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = i;
options.outline.maxSize = i;
@@ -614,7 +621,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 7;
options.outline.maxSize = 7;
@@ -678,7 +685,7 @@
);
for (int i = 2; i < 8; i++) {
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = i;
options.outline.maxSize = i;
@@ -735,7 +742,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 3;
options.outline.maxSize = 3;
@@ -808,7 +815,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 3;
options.outline.maxSize = 3;
@@ -879,7 +886,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 3;
options.outline.maxSize = 3;
@@ -943,7 +950,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 5;
options.outline.maxSize = 5;
@@ -1003,7 +1010,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 4;
options.outline.maxSize = 4;
@@ -1077,7 +1084,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 4;
options.outline.maxSize = 4;
@@ -1152,7 +1159,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 3; // Outline add, sub and mul.
options.outline.maxSize = 3;
@@ -1204,7 +1211,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 3;
options.outline.maxSize = 3;
@@ -1249,7 +1256,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 1;
options.outline.minSize = 3;
options.outline.maxSize = 3;
@@ -1455,7 +1462,7 @@
" return-void"
);
- InternalOptions options = new InternalOptions();
+ InternalOptions options = createInternalOptions();
options.outline.threshold = 2;
DexApplication originalApplication = buildApplicationWithAndroidJar(builder, options);
diff --git a/src/test/java/com/android/tools/r8/utils/D8CommandTest.java b/src/test/java/com/android/tools/r8/utils/D8CommandTest.java
index 6f45137..9cc7eda 100644
--- a/src/test/java/com/android/tools/r8/utils/D8CommandTest.java
+++ b/src/test/java/com/android/tools/r8/utils/D8CommandTest.java
@@ -16,6 +16,7 @@
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.google.common.collect.ImmutableList;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -46,7 +47,7 @@
verifyEmptyCommand(parse("\t", "\t"));
}
- private void verifyEmptyCommand(D8Command command) {
+ private void verifyEmptyCommand(D8Command command) throws IOException {
assertEquals(0, ToolHelper.getApp(command).getDexProgramResources().size());
assertEquals(0, ToolHelper.getApp(command).getClassProgramResources().size());
assertFalse(ToolHelper.getApp(command).hasMainDexList());
@@ -156,6 +157,42 @@
}
@Test
+ public void mainDexList() throws Throwable {
+ Path mainDexList1 = temp.newFile("main-dex-list-1.txt").toPath();
+ Path mainDexList2 = temp.newFile("main-dex-list-2.txt").toPath();
+
+ D8Command command = parse("--main-dex-list", mainDexList1.toString());
+ assertTrue(ToolHelper.getApp(command).hasMainDexList());
+
+ command = parse(
+ "--main-dex-list", mainDexList1.toString(), "--main-dex-list", mainDexList2.toString());
+ assertTrue(ToolHelper.getApp(command).hasMainDexList());
+ }
+
+ @Test
+ public void nonExistingMainDexList() throws Throwable {
+ thrown.expect(FileNotFoundException.class);
+ Path mainDexList = temp.getRoot().toPath().resolve("main-dex-list.txt");
+ parse("--main-dex-list", mainDexList.toString());
+ }
+
+ @Test
+ public void mainDexListWithFilePerClass() throws Throwable {
+ thrown.expect(CompilationException.class);
+ Path mainDexList = temp.newFile("main-dex-list.txt").toPath();
+ D8Command command = parse("--main-dex-list", mainDexList.toString(), "--file-per-class");
+ assertTrue(ToolHelper.getApp(command).hasMainDexList());
+ }
+
+ @Test
+ public void mainDexListWithIntermediate() throws Throwable {
+ thrown.expect(CompilationException.class);
+ Path mainDexList = temp.newFile("main-dex-list.txt").toPath();
+ D8Command command = parse("--main-dex-list", mainDexList.toString(), "--intermediate");
+ assertTrue(ToolHelper.getApp(command).hasMainDexList());
+ }
+
+ @Test
public void invalidOutputFileTypeParse() throws Throwable {
thrown.expect(CompilationException.class);
Path invalidType = temp.getRoot().toPath().resolve("an-invalid-output-file-type.foobar");
diff --git a/src/test/java/com/android/tools/r8/utils/R8CommandTest.java b/src/test/java/com/android/tools/r8/utils/R8CommandTest.java
index 0c737b9..cb2085f 100644
--- a/src/test/java/com/android/tools/r8/utils/R8CommandTest.java
+++ b/src/test/java/com/android/tools/r8/utils/R8CommandTest.java
@@ -16,8 +16,10 @@
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.shaking.ProguardRuleParserException;
import com.google.common.collect.ImmutableList;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
@@ -46,7 +48,7 @@
verifyEmptyCommand(parse("\t", "\t"));
}
- private void verifyEmptyCommand(R8Command command) {
+ private void verifyEmptyCommand(R8Command command) throws IOException {
assertEquals(0, ToolHelper.getApp(command).getDexProgramResources().size());
assertEquals(0, ToolHelper.getApp(command).getClassProgramResources().size());
assertFalse(ToolHelper.getApp(command).hasMainDexList());
@@ -89,6 +91,66 @@
}
@Test
+ public void mainDexRules() throws Throwable {
+ Path mainDexRules1 = temp.newFile("main-dex-1.rules").toPath();
+ Path mainDexRules2 = temp.newFile("main-dex-2.rules").toPath();
+ parse("--main-dex-rules", mainDexRules1.toString());
+ parse("--main-dex-rules", mainDexRules1.toString(), "--main-dex-rules", mainDexRules2.toString());
+ }
+
+ @Test
+ public void nonExistingMainDexRules() throws Throwable {
+ thrown.expect(NoSuchFileException.class);
+ Path mainDexRules = temp.getRoot().toPath().resolve("main-dex.rules");
+ parse("--main-dex-rules", mainDexRules.toString());
+ }
+
+ @Test
+ public void mainDexList() throws Throwable {
+ Path mainDexList1 = temp.newFile("main-dex-list-1.txt").toPath();
+ Path mainDexList2 = temp.newFile("main-dex-list-2.txt").toPath();
+ parse("--main-dex-list", mainDexList1.toString());
+ parse("--main-dex-list", mainDexList1.toString(), "--main-dex-list", mainDexList2.toString());
+ }
+
+ @Test
+ public void nonExistingMainDexList() throws Throwable {
+ thrown.expect(FileNotFoundException.class);
+ Path mainDexList = temp.getRoot().toPath().resolve("main-dex-list.txt");
+ parse("--main-dex-list", mainDexList.toString());
+ }
+
+ @Test
+ public void minimalMainDex() throws Throwable {
+ thrown.expect(CompilationException.class);
+ parse("--minimal-main-dex");
+ }
+
+ @Test
+ public void mainDexListOutput() throws Throwable {
+ Path mainDexRules = temp.newFile("main-dex.rules").toPath();
+ Path mainDexList = temp.newFile("main-dex-list.txt").toPath();
+ Path mainDexListOutput = temp.newFile("main-dex-out.txt").toPath();
+ parse("--main-dex-rules", mainDexRules.toString(),
+ "--main-dex-list-output", mainDexListOutput.toString());
+ parse("--main-dex-list", mainDexList.toString(),
+ "--main-dex-list-output", mainDexListOutput.toString());
+ }
+
+ @Test
+ public void mainDexListOutputWithoutAnyMainDexSpecification() throws Throwable {
+ thrown.expect(CompilationException.class);
+ Path mainDexListOutput = temp.newFile("main-dex-out.txt").toPath();
+ parse("--main-dex-list-output", mainDexListOutput.toString());
+ }
+
+ @Test
+ public void mainDexRulesWithMinimalMainDex() throws Throwable {
+ Path mainDexRules = temp.newFile("main-dex.rules").toPath();
+ parse("--main-dex-rules", mainDexRules.toString(), "--minimal-main-dex");
+ }
+
+ @Test
public void existingOutputDirWithDexFiles() throws Throwable {
Path existingDir = temp.newFolder().toPath();
List<Path> classesFiles = ImmutableList.of(
diff --git a/src/test/java/com/android/tools/r8/utils/R8InliningTest.java b/src/test/java/com/android/tools/r8/utils/R8InliningTest.java
index 50db347..7f3c3e1 100644
--- a/src/test/java/com/android/tools/r8/utils/R8InliningTest.java
+++ b/src/test/java/com/android/tools/r8/utils/R8InliningTest.java
@@ -85,7 +85,10 @@
.setOutputPath(out)
.addProguardConfigurationFiles(Paths.get(keepRulesFile))
.build();
- ToolHelper.runR8(command);
+ // TODO(62048823): Enable minification.
+ ToolHelper.runR8(command, o -> {
+ o.skipMinification = true;
+ });
ToolHelper.runArtNoVerificationErrors(out + "/classes.dex", "inlining.Inlining");
}
diff --git a/src/test/proguard/invalid/optimizationpasses-without-n.flags b/src/test/proguard/invalid/optimizationpasses-without-n.flags
new file mode 100644
index 0000000..d0ca252
--- /dev/null
+++ b/src/test/proguard/invalid/optimizationpasses-without-n.flags
@@ -0,0 +1,6 @@
+# Copyright (c) 2017, 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.
+
+# Should specify the number of optimization passes
+-optimizationpasses
diff --git a/src/test/proguard/valid/dontoptimize-overrides-optimizationpasses.flags b/src/test/proguard/valid/dontoptimize-overrides-optimizationpasses.flags
new file mode 100644
index 0000000..cfc365c
--- /dev/null
+++ b/src/test/proguard/valid/dontoptimize-overrides-optimizationpasses.flags
@@ -0,0 +1,7 @@
+# Copyright (c) 2017, 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.
+
+-dontoptimize
+# dontoptimize will set the number of optimization passes zero whatever you put below.
+-optimizationpasses 1337
diff --git a/src/test/proguard/valid/optimizationpasses.flags b/src/test/proguard/valid/optimizationpasses.flags
new file mode 100644
index 0000000..c21e025
--- /dev/null
+++ b/src/test/proguard/valid/optimizationpasses.flags
@@ -0,0 +1,5 @@
+# Copyright (c) 2017, 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.
+
+-optimizationpasses 8
diff --git a/third_party/gmscore/latest.tar.gz.sha1 b/third_party/gmscore/latest.tar.gz.sha1
index ee32244..ff9670c 100644
--- a/third_party/gmscore/latest.tar.gz.sha1
+++ b/third_party/gmscore/latest.tar.gz.sha1
@@ -1 +1 @@
-cfe138adecffb420a86810f1b1ca03025dda2c06
\ No newline at end of file
+fccdb3790c03128d54d6926b56243f47a4baa625
\ No newline at end of file
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 1dabbd3..ee8981b 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -158,9 +158,9 @@
app_provided_pg_conf = True
if options.k:
args.extend(['--pg-conf', options.k])
- if 'multidexrules' in values:
- for rules in values['multidexrules']:
- args.extend(['--multidex-rules', rules])
+ if 'maindexrules' in values:
+ for rules in values['maindexrules']:
+ args.extend(['--main-dex-rules', rules])
if not options.no_libraries and 'libraries' in values:
for lib in values['libraries']:
diff --git a/tools/test.py b/tools/test.py
index 53a7b1e..ba459e7 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -66,7 +66,7 @@
u_dir = uuid.uuid4()
destination = 'gs://%s/%s' % (BUCKET, u_dir)
utils.upload_html_to_cloud_storage(upload_dir, destination)
- url = 'http://storage.googleapis.com/%s/%s/index.html' % (BUCKET, u_dir)
+ url = 'http://storage.googleapis.com/%s/%s/test/index.html' % (BUCKET, u_dir)
print 'Test results available at: %s' % url
def Main():
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index a3d3791..114e6c7 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -77,7 +77,7 @@
'pgconf': [
'%s_proguard.config' % V12_22_PREFIX,
'%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
- 'multidexrules' : [
+ 'maindexrules' : [
os.path.join(V12_22_BASE, 'mainDexClasses.rules'),
os.path.join(V12_22_BASE, 'main-dex-classes-release.cfg'),
os.path.join(V12_22_BASE, 'main_dex_YouTubeRelease_proguard.cfg')],
