Import of https://gitlab.ow2.org/asm/asm.

#MIGRATION_3P_JAVA_ASM__DEFAULT_SERVICE - a087e8a1d3a16bff9c533bd800f5978758262248 Update JaCoCo to version 0.8.10 by Evgeny Mandrikov <[email protected]> - 0caa0d4214fba986f4b987d0161629238a687dd1 Add support for 'new' after 'invokespecial <init>' (in by... by Eric Bruneton <[email protected]> - 579caab5e018bdcbd80ca3601446439f65efd4fb Update SonarQube plugin to latest version. by Eric Bruneton <[email protected]> - d70cd319a5a26fd3683ceacc079311b6c3bdb095 Upgrade to Gradle 8.3. by Eric Bruneton <[email protected]> - 082e5c985516d5351ba55f337ebb9d3571c5dc53 Increase JVM Metaspace size in an attempt to fix Sonar Gr... by Eric Bruneton <[email protected]> - 44ae3de4bfb2aea7e4afe6152bd4b7b8289be9ac Add quotes around jvmargs option. by Eric Bruneton <[email protected]> - c890eac5963700541703445d06c62c18e044d671 Fix typo in .gitlab-ci.yml'. by Eric Bruneton <[email protected]> - 5d00fe4ea47b17f3d2e981a18ee447d9b1d32de1 Add a getArgumentCount() method in Type. by Eric Bruneton <[email protected]> - 10317262ee5f23be4ad8b42f384aebb5d81cad04 Update version number. by Eric Bruneton <[email protected]> - af4ee811fde0b14bd7db84aa944a1b3733c37289 Remove an extra space at the end of a line. by Eric Spishak-Thomas <[email protected]> PiperOrigin-RevId: 575850030
google · Oct 23, 2023 · a79e7af · a79e7af
1 parent 61bd721
commit a79e7af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/javatests/com/google/turbine/lower/LongStringIntegrationTest.java b/javatests/com/google/turbine/lower/LongStringIntegrationTest.java
@@ -44,7 +44,7 @@ public class LongStringIntegrationTest {
   public void test() throws Exception {
     Map<String, byte[]> output =
         runTurbineWithStack(
-            /* stackSize= */ 100_000,
+            /* stackSize= */ 200_000,
             /* input= */ ImmutableMap.of("Test.java", source()),
             /* classpath= */ ImmutableList.of());
 

diff --git a/javatests/com/google/turbine/lower/testdata/golden/outer.txt b/javatests/com/google/turbine/lower/testdata/golden/outer.txt
@@ -16,6 +16,6 @@ public class test/Test implements java/util/List {
   // access flags 0x1
   // signature <V::Ljava/lang/Runnable;E:Ljava/lang/Error;>(I)V^TE;
   // declaration: void g<V extends java.lang.Runnable, E extends java.lang.Error>(int) throws E
-  public g(I)V throws java/lang/Error 
+  public g(I)V throws java/lang/Error
     // parameter  foo
 }
diff --git a/javatests/com/google/turbine/testing/AsmUtils.java b/javatests/com/google/turbine/testing/AsmUtils.java
@@ -16,6 +16,10 @@
 
 package com.google.turbine.testing;
 
+import static java.util.stream.Collectors.joining;
+
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Splitter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import org.objectweb.asm.ClassReader;
@@ -37,7 +41,12 @@ public static String textify(byte[] bytes, boolean skipDebug) {
             ClassReader.SKIP_FRAMES
                 | ClassReader.SKIP_CODE
                 | (skipDebug ? ClassReader.SKIP_DEBUG : 0));
-    return sw.toString();
+    // TODO(cushon): Remove this after next ASM update
+    // See https://gitlab.ow2.org/asm/asm/-/commit/af4ee811fde0b14bd7db84aa944a1b3733c37289
+    return Splitter.onPattern("\\R")
+        .splitToStream(sw.toString())
+        .map(CharMatcher.is(' ')::trimTrailingFrom)
+        .collect(joining("\n"));
   }
 
   private AsmUtils() {}