diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-07-20 17:24:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 17:24:42 -0700 |
| commit | 6b99dfe746cbb76828db495b58e55db2a0265ee2 (patch) | |
| tree | 44abc925a9e9fc4a77a75a1983c42654c7cf8f89 /test/files | |
| parent | 5ddb0bbe36e7caa44c9442b059d103f7f4e75331 (diff) | |
| parent | e619b033350a3378d650db4c3e5b1bfc83b73d81 (diff) | |
| download | scala-6b99dfe746cbb76828db495b58e55db2a0265ee2.tar.gz scala-6b99dfe746cbb76828db495b58e55db2a0265ee2.tar.bz2 scala-6b99dfe746cbb76828db495b58e55db2a0265ee2.zip | |
Merge pull request #5293 from lrytz/asm-51
upgrade asm to 5.1
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/run/classfile-format-51.scala | 2 | ||||
| -rw-r--r-- | test/files/run/noInlineUnknownIndy/Test.scala | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/files/run/classfile-format-51.scala b/test/files/run/classfile-format-51.scala index 3a6c4861f1..40eebee198 100644 --- a/test/files/run/classfile-format-51.scala +++ b/test/files/run/classfile-format-51.scala @@ -80,7 +80,7 @@ object Test extends DirectTest { val test = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "test", s"()Ljava/lang/String;", null, null) test.visitCode() - val bootstrapHandle = new Handle(H_INVOKESTATIC, invokerClassName, bootstrapMethodName, bootStrapMethodType) + val bootstrapHandle = new Handle(H_INVOKESTATIC, invokerClassName, bootstrapMethodName, bootStrapMethodType, /* itf = */ false) test.visitInvokeDynamicInsn("invoke", targetMethodType, bootstrapHandle) test.visitInsn(ARETURN) test.visitMaxs(1, 1) diff --git a/test/files/run/noInlineUnknownIndy/Test.scala b/test/files/run/noInlineUnknownIndy/Test.scala index c6d227b6f2..a666146f15 100644 --- a/test/files/run/noInlineUnknownIndy/Test.scala +++ b/test/files/run/noInlineUnknownIndy/Test.scala @@ -15,7 +15,12 @@ object Test extends DirectTest { } def show(): Unit = { - val unknownBootstrapMethod = new Handle(Opcodes.H_INVOKESTATIC, "not/java/lang/SomeLambdaMetafactory", "notAMetaFactoryMethod", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;") + val unknownBootstrapMethod = new Handle( + Opcodes.H_INVOKESTATIC, + "not/java/lang/SomeLambdaMetafactory", + "notAMetaFactoryMethod", + "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;", + /* itf = */ false) modifyClassFile(new File(testOutput.toFile, "A_1.class"))((cn: ClassNode) => { val testMethod = cn.methods.iterator.asScala.find(_.name == "test").head val indy = testMethod.instructions.iterator.asScala.collect({ case i: InvokeDynamicInsnNode => i }).next() |