diff options
| author | 2017-03-13 14:50:04 +0000 | |
|---|---|---|
| committer | 2017-03-13 16:08:01 +0000 | |
| commit | 0b66d6174bf1f6023f9d36dda8538490b79c2e9f (patch) | |
| tree | 1cc4d2ae868745a65fd0489a6fb2f5f2fc9e880f /test/157-void-class/src/Main.java | |
| parent | 6374c58f2ea403b3a05fb27376110fe4d0fc8e3f (diff) | |
Revert^5 "Hash-based dex cache type array."
For app images, ImageWriter does not add boot image
classes to the app image class table even though it
keeps them in the dex caches. The reason for that is
unknown, the code looks OK.
Bug: 34839984
Bug: 30627598
Bug: 34659969
Also reverts "Improve debugging output for a crash."
This reverts commits
bfb80d25eaeb7a604d5dd25a370e3869e96a33ab,
8dd56fcb3196f466ecaffd445397cb11ef85f89f.
Test: testrunner.py --host
Change-Id: Ic8db128207c07588c7f11563208ae1e85c8b0e84
Diffstat (limited to 'test/157-void-class/src/Main.java')
| -rw-r--r-- | test/157-void-class/src/Main.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/157-void-class/src/Main.java b/test/157-void-class/src/Main.java index 322b705f1d..0a052e774d 100644 --- a/test/157-void-class/src/Main.java +++ b/test/157-void-class/src/Main.java @@ -35,7 +35,11 @@ public class Main { } // Clear the resolved types of the ojluni dex file to make sure there is no entry // for "V", i.e. void. - clearResolvedTypes(Integer.class); + // 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); + } // 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 |