Merge "Add regression test for Const16 loads not using a register that is >255"
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 ee64165..121f47d 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
@@ -3033,10 +3033,8 @@
if (!value.isPhi()
&& value.definition.isNumberConversion()
&& value.definition.asNumberConversion().to == NumericType.DOUBLE) {
- Value newValue = code.createValue(
- instruction.outValue().outType(), instruction.getLocalInfo());
InvokeStatic invokeIsNaN =
- new InvokeStatic(javaLangDoubleisNaN.get(), newValue, ImmutableList.of(value));
+ new InvokeStatic(javaLangDoubleisNaN.get(), null, ImmutableList.of(value));
invokeIsNaN.setPosition(instruction.getPosition());
// Insert the invoke before the current instruction.
diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index ccc1ccf..3dc03f8 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -72,6 +72,7 @@
ALWAYS_INLINE,
CONFLICT,
ILLEGAL_ACCESS,
+ NATIVE_METHOD,
NO_SIDE_EFFECTS,
PINNED_SOURCE,
RESOLUTION_FOR_FIELDS_MAY_CHANGE,
@@ -99,6 +100,9 @@
case ILLEGAL_ACCESS:
message = "it could lead to illegal accesses";
break;
+ case NATIVE_METHOD:
+ message = "it has a native method";
+ break;
case NO_SIDE_EFFECTS:
message = "it is mentioned in appInfo.noSideEffects";
break;
@@ -174,6 +178,14 @@
extractPinnedItems(appInfo.alwaysInline, pinnedTypes, AbortReason.ALWAYS_INLINE);
extractPinnedItems(appInfo.noSideEffects.keySet(), pinnedTypes, AbortReason.NO_SIDE_EFFECTS);
+ for (DexProgramClass clazz : classes) {
+ for (DexEncodedMethod method : clazz.methods()) {
+ if (method.accessFlags.isNative()) {
+ markTypeAsPinned(clazz.type, pinnedTypes, AbortReason.NATIVE_METHOD);
+ }
+ }
+ }
+
// Avoid merging two types if this could remove a NoSuchMethodError, as illustrated by the
// following example. (Alternatively, it would be possible to merge A and B and rewrite the
// "invoke-super A.m" instruction into "invoke-super Object.m" to preserve the error. This
@@ -202,11 +214,7 @@
for (DexItem item : items) {
if (item instanceof DexType || item instanceof DexClass) {
DexType type = item instanceof DexType ? (DexType) item : ((DexClass) item).type;
- // We check for the case where the type is pinned according to appInfo.isPinned, so only
- // add it here if it is not the case.
- if (!appInfo.isPinned(type)) {
- markTypeAsPinned(type, pinnedTypes, reason);
- }
+ markTypeAsPinned(type, pinnedTypes, reason);
} else if (item instanceof DexField || item instanceof DexEncodedField) {
// Pin the holder and the type of the field.
DexField field =
@@ -229,6 +237,12 @@
}
private void markTypeAsPinned(DexType type, Set<DexType> pinnedTypes, AbortReason reason) {
+ if (appInfo.isPinned(type)) {
+ // We check for the case where the type is pinned according to appInfo.isPinned,
+ // so we only need to add it here if it is not the case.
+ return;
+ }
+
DexClass clazz = appInfo.definitionFor(type);
if (clazz != null && clazz.isProgramClass()) {
boolean changed = pinnedTypes.add(type);
