diff options
| author | 2017-03-14 10:13:21 +0000 | |
|---|---|---|
| committer | 2017-03-14 13:55:13 +0000 | |
| commit | 8d6768d47b66a688d35399d524ad5a5450e9d9d4 (patch) | |
| tree | 0b8733baef378d9e060c8e74319a3846489590b2 /test/157-void-class/src/Main.java | |
| parent | fbe1516b91f2117bb9c7282aaea5537572f62dd7 (diff) | |
Revert^6 "Hash-based dex cache type array."
Fixed ImageWriter to write class table also if it contains
only boot class loader classes. Added a regression test and
added extra checks for debug-build to verify that dex cache
types from app image are also in the class table. Removed
some unnecessary debug output.
Test: 158-app-image-class-table
Bug: 34839984
Bug: 30627598
Bug: 34659969
This reverts commit 0b66d6174bf1f6023f9d36dda8538490b79c2e9f.
Change-Id: I6a747904940c6ebc297f4946feef99dc0adf930c
Diffstat (limited to 'test/157-void-class/src/Main.java')
| -rw-r--r-- | test/157-void-class/src/Main.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/157-void-class/src/Main.java b/test/157-void-class/src/Main.java index 0a052e774d..322b705f1d 100644 --- a/test/157-void-class/src/Main.java +++ b/test/157-void-class/src/Main.java @@ -35,11 +35,7 @@ public class Main { } // Clear the resolved types of the ojluni dex file to make sure there is no entry // for "V", i.e. void. - // TODO: Enable clearing the dex cache when we switch to the hash-based type array - // and do a proper lookup. Currently, ClassLinker fully relies on the DexCache. - if (false) { - clearResolvedTypes(Integer.class); - } + clearResolvedTypes(Integer.class); // With java.lang.Void being compile-time verified but uninitialized, initialize // it now. Previously, this would indirectly initialize TYPE with the current, // i.e. zero-initialized, value of TYPE. The only thing that could prevent the |