diff options
| author | kmb <kmb@google.com> | 2018-02-06 13:43:30 -0800 |
|---|---|---|
| committer | Ivan Gavrilovic <gavra@google.com> | 2018-05-04 10:37:09 +0100 |
| commit | 40fa0d9a56e8b29219f37cdc8743b63c7b65ab55 (patch) | |
| tree | 92100cba879b08d6f83f96b53ee0ff50b26d3168 | |
| parent | 47bb3bfbc969ea3ac98381cb67c3a6b8821012f5 (diff) | |
| download | desugar-40fa0d9a56e8b29219f37cdc8743b63c7b65ab55.tar.gz | |
drop debug info when loading classes in desugar as a workaround for https://bugs.openjdk.java.net/browse/JDK-8066981
RELNOTES: None.
PiperOrigin-RevId: 184732576
GitOrigin-RevId: e85e280645f579ffd5511a41553e95713c80177d
Change-Id: Ic2e2372810c649b0376183b011441e70f08d57d1
| -rw-r--r-- | java/com/google/devtools/build/android/desugar/HeaderClassLoader.java | 3 | ||||
| -rw-r--r-- | test/java/com/google/devtools/build/android/desugar/b72690624_testdata.jar | bin | 0 -> 3088 bytes |
2 files changed, 2 insertions, 1 deletions
diff --git a/java/com/google/devtools/build/android/desugar/HeaderClassLoader.java b/java/com/google/devtools/build/android/desugar/HeaderClassLoader.java index 0a757bf..77d99bb 100644 --- a/java/com/google/devtools/build/android/desugar/HeaderClassLoader.java +++ b/java/com/google/devtools/build/android/desugar/HeaderClassLoader.java @@ -58,7 +58,8 @@ class HeaderClassLoader extends ClassLoader { // Have ASM compute maxs so we don't need to figure out how many formal parameters there are ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS); ImmutableList<FieldInfo> interfaceFieldNames = getFieldsIfReaderIsInterface(reader); - reader.accept(new CodeStubber(writer, interfaceFieldNames), 0); + // TODO(kmb): Consider SKIP_CODE and stubbing everything so class loader doesn't verify code + reader.accept(new CodeStubber(writer, interfaceFieldNames), ClassReader.SKIP_DEBUG); bytecode = writer.toByteArray(); } catch (IOException e) { throw new IOError(e); diff --git a/test/java/com/google/devtools/build/android/desugar/b72690624_testdata.jar b/test/java/com/google/devtools/build/android/desugar/b72690624_testdata.jar Binary files differnew file mode 100644 index 0000000..6cca3a0 --- /dev/null +++ b/test/java/com/google/devtools/build/android/desugar/b72690624_testdata.jar |