Using ASM 7 for ART tests
This is needed as ASM 6 cannot handle Java 11 class files.
Bug: 207852006
Test: art/test/testrunner/testrunner.py --host -b
Change-Id: Icd048df627ca1b88053a30aef40677198205e387
diff --git a/test/1948-obsolete-const-method-handle/util-src/build-classes b/test/1948-obsolete-const-method-handle/util-src/build-classes
index 792ad41..9b3c5a6 100755
--- a/test/1948-obsolete-const-method-handle/util-src/build-classes
+++ b/test/1948-obsolete-const-method-handle/util-src/build-classes
@@ -24,7 +24,7 @@
fi
SCRIPT_PATH=$( cd $(dirname $0) ; pwd -P )
-ASM_CLASSPATH="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-6.0.jar"
+ASM_CLASSPATH="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-7.0.jar"
SRC_PATH="${SCRIPT_PATH}/src"
BUILD_PATH="${1:-${SCRIPT_PATH}/classes}"
diff --git a/test/1948-obsolete-const-method-handle/util-src/src/art/constmethodhandle/TestGenerator.java b/test/1948-obsolete-const-method-handle/util-src/src/art/constmethodhandle/TestGenerator.java
index 40b5cf9..3d194b4 100644
--- a/test/1948-obsolete-const-method-handle/util-src/src/art/constmethodhandle/TestGenerator.java
+++ b/test/1948-obsolete-const-method-handle/util-src/src/art/constmethodhandle/TestGenerator.java
@@ -71,7 +71,7 @@
ClassReader cr = new ClassReader(initClass);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
cr.accept(
- new ClassVisitor(Opcodes.ASM6, cw) {
+ new ClassVisitor(Opcodes.ASM7, cw) {
@Override
public void visitEnd() {
generateStringAccessorMethod(
@@ -143,7 +143,7 @@
ClassReader cr = new ClassReader(inputClass);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
cr.accept(
- new ClassVisitor(Opcodes.ASM6, cw) {
+ new ClassVisitor(Opcodes.ASM7, cw) {
@Override
public void visitEnd() {
generateRunTest(cw, toCall);
diff --git a/test/2034-spaces-in-SimpleName/build b/test/2034-spaces-in-SimpleName/build
index 5b92095..79b63e1 100755
--- a/test/2034-spaces-in-SimpleName/build
+++ b/test/2034-spaces-in-SimpleName/build
@@ -17,7 +17,7 @@
# Stop on failure and be verbose.
set -e -x
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-6.0.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-7.0.jar"
# generate Java bytecode with ASM
cd src_gen
diff --git a/test/952-invoke-custom/build b/test/952-invoke-custom/build
index da9c159..c96b835 100755
--- a/test/952-invoke-custom/build
+++ b/test/952-invoke-custom/build
@@ -17,7 +17,7 @@
# Stop on failure.
set -e
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-6.0.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-7.0.jar"
export ORIGINAL_JAVAC="$JAVAC"
diff --git a/test/952-invoke-custom/util-src/transformer/IndyTransformer.java b/test/952-invoke-custom/util-src/transformer/IndyTransformer.java
index d21dbbe..6401c54 100644
--- a/test/952-invoke-custom/util-src/transformer/IndyTransformer.java
+++ b/test/952-invoke-custom/util-src/transformer/IndyTransformer.java
@@ -189,7 +189,7 @@
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
try (InputStream is = Files.newInputStream(inputClassPath)) {
ClassReader cr = new ClassReader(is);
- cr.accept(new BootstrapBuilder(Opcodes.ASM6, cw, callsiteMap), 0);
+ cr.accept(new BootstrapBuilder(Opcodes.ASM7, cw, callsiteMap), 0);
}
try (OutputStream os = Files.newOutputStream(outputClassPath)) {
os.write(cw.toByteArray());
diff --git a/test/979-const-method-handle/build b/test/979-const-method-handle/build
index caac937..31d2cbf 100755
--- a/test/979-const-method-handle/build
+++ b/test/979-const-method-handle/build
@@ -17,7 +17,7 @@
# make us exit on a failure
set -e
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-6.0.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-7.0.jar"
export ORIGINAL_JAVAC="$JAVAC"
diff --git a/test/979-const-method-handle/util-src/transformer/ConstantTransformer.java b/test/979-const-method-handle/util-src/transformer/ConstantTransformer.java
index 9356426..771a267 100644
--- a/test/979-const-method-handle/util-src/transformer/ConstantTransformer.java
+++ b/test/979-const-method-handle/util-src/transformer/ConstantTransformer.java
@@ -215,7 +215,7 @@
ClassReader cr = new ClassReader(is);
ConstantBuilder cb =
new ConstantBuilder(
- Opcodes.ASM6, cw, constantMethodHandles, constantMethodTypes);
+ Opcodes.ASM7, cw, constantMethodHandles, constantMethodTypes);
cr.accept(cb, 0);
}
try (OutputStream os = Files.newOutputStream(outputClassPath)) {