Enable code item deduping
Dedupe code items if they have the same contents, this is safe
because of the fixed quickening logic.
Removed duplicate code items in ManyMethods that caused the startup
methods section to be empty in dex2oat_test.
To avoid errors related to quickening and compilation of shared code
items, quickening is currently disabled for shared code items.
Bug: 63756964
Test: test-art-host
Change-Id: I7c62eb746785d787c5269effd396f7be4859d3a6
diff --git a/test/ManyMethods/ManyMethods.java b/test/ManyMethods/ManyMethods.java
index b3a57f6..98b9faf 100644
--- a/test/ManyMethods/ManyMethods.java
+++ b/test/ManyMethods/ManyMethods.java
@@ -26,6 +26,8 @@
public static String msg7 = "Hello World7";
public static String msg8 = "Hello World8";
public static String msg9 = "Hello World9";
+ public static String msg10 = "Hello World10";
+ public static String msg11 = "Hello World11";
}
static class Printer {
@@ -57,35 +59,35 @@
}
public static void Print4() {
- Printer.Print(Strings.msg2);
+ Printer.Print(Strings.msg4);
}
public static void Print5() {
- Printer.Print(Strings.msg3);
- }
-
- public static void Print6() {
- Printer2.Print(Strings.msg4);
- }
-
- public static void Print7() {
Printer.Print(Strings.msg5);
}
+ public static void Print6() {
+ Printer2.Print(Strings.msg6);
+ }
+
+ public static void Print7() {
+ Printer.Print(Strings.msg7);
+ }
+
public static void Print8() {
- Printer.Print(Strings.msg6);
+ Printer.Print(Strings.msg8);
}
public static void Print9() {
- Printer2.Print(Strings.msg7);
+ Printer2.Print(Strings.msg9);
}
public static void Print10() {
- Printer2.Print(Strings.msg8);
+ Printer2.Print(Strings.msg10);
}
public static void Print11() {
- Printer.Print(Strings.msg9);
+ Printer.Print(Strings.msg11);
}
public static void main(String args[]) {