From 209c82eb5f56dceb30b9fab22c7cb8383507e131 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Fri, 10 Aug 2018 10:44:42 -0700 Subject: Work around bug in desugar context: https://gitlab.ow2.org/asm/asm/issues/317842 Fixes #5855 --- third_party/asm/asm-6.2.1.jar | Bin 112958 -> 112953 bytes third_party/asm/google.patch | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 third_party/asm/google.patch diff --git a/third_party/asm/asm-6.2.1.jar b/third_party/asm/asm-6.2.1.jar index cc00792662..1283080723 100644 Binary files a/third_party/asm/asm-6.2.1.jar and b/third_party/asm/asm-6.2.1.jar differ 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 -- cgit v1.2.3