diff options
author | Liam Miller-Cushon <cushon@google.com> | 2018-08-10 10:44:42 -0700 |
---|---|---|
committer | Jingwen Chen <jingwen@jingwen.hot.corp.google.com> | 2018-08-10 17:27:31 -0400 |
commit | 209c82eb5f56dceb30b9fab22c7cb8383507e131 (patch) | |
tree | 4ebcb1a68b73d71017da29a908169bc79dd68f4c | |
parent | 8f9416cf6057f67170d7f4ced72e43d9682f331b (diff) |
Work around bug in desugar
context: https://gitlab.ow2.org/asm/asm/issues/317842
Fixes #5855
-rw-r--r-- | third_party/asm/asm-6.2.1.jar | bin | 112958 -> 112953 bytes | |||
-rw-r--r-- | third_party/asm/google.patch | 17 |
2 files changed, 17 insertions, 0 deletions
diff --git a/third_party/asm/asm-6.2.1.jar b/third_party/asm/asm-6.2.1.jar Binary files differindex cc00792662..1283080723 100644 --- a/third_party/asm/asm-6.2.1.jar +++ b/third_party/asm/asm-6.2.1.jar diff --git a/third_party/asm/google.patch b/third_party/asm/google.patch new file mode 100644 index 0000000000..22b6c6f64a --- /dev/null +++ b/third_party/asm/google.patch @@ -0,0 +1,17 @@ +diff --git a/asm/src/main/java/org/objectweb/asm/ClassWriter.java b/asm/src/main/java/org/objectweb/asm/ClassWriter.java +index 3e872338..97479a61 100644 +--- a/asm/src/main/java/org/objectweb/asm/ClassWriter.java ++++ b/asm/src/main/java/org/objectweb/asm/ClassWriter.java +@@ -271,9 +271,9 @@ public class ClassWriter extends ClassVisitor { + this.interfaces[i] = symbolTable.addConstantClass(interfaces[i]).index; + } + } +- if (compute == MethodWriter.COMPUTE_MAX_STACK_AND_LOCAL && (version & 0xFFFF) >= Opcodes.V1_7) { +- compute = MethodWriter.COMPUTE_MAX_STACK_AND_LOCAL_FROM_FRAMES; +- } ++ // if (compute == MethodWriter.COMPUTE_MAX_STACK_AND_LOCAL && (version & 0xFFFF) >= Opcodes.V1_7) { ++ // compute = MethodWriter.COMPUTE_MAX_STACK_AND_LOCAL_FROM_FRAMES; ++ // } + } + + @Override |