stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8196920: VerifierTest_1A.java and VerifierTest_1B.java fail: assert(receiver_klass->is_subtype_of(static_receiver_klass)) failed: actual receiver must be subclass of static receiver klass

Browse Source 
Add an unverifiable method to the test class

Reviewed-by: dholmes, iklam
This commit is contained in:
Calvin Cheung 2018-02-14 10:32:19 -08:00
parent 128f91288c
commit 26712bcb1b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/hotspot/jtreg/runtime/appcds/VerifierTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -279,7 +279,7 @@ public class VerifierTest implements Opcodes {
MethodVisitor mv; MethodVisitor mv;
AnnotationVisitor av0; AnnotationVisitor av0;
cw.visit(V1_6, ACC_SUPER, "UnverifiableBase", null, "java/lang/Object", null); cw.visit(V1_8, ACC_SUPER, "UnverifiableBase", null, "java/lang/Object", null);
{ {
fv = cw.visitField(ACC_FINAL + ACC_STATIC, "x", "LVerifierTest;", null, null); fv = cw.visitField(ACC_FINAL + ACC_STATIC, "x", "LVerifierTest;", null, null);
fv.visitEnd(); fv.visitEnd();
@ -296,8 +296,7 @@ public class VerifierTest implements Opcodes {
{ {
mv = cw.visitMethod(ACC_STATIC, "<clinit>", "()V", null, null); mv = cw.visitMethod(ACC_STATIC, "<clinit>", "()V", null, null);
mv.visitCode(); mv.visitCode();
//WAS mv.visitTypeInsn(NEW, "VerifierTest"); mv.visitTypeInsn(NEW, "VerifierTest0");
mv.visitTypeInsn(NEW, "java/lang/Object");
mv.visitInsn(DUP); mv.visitInsn(DUP);
mv.visitMethodInsn(INVOKESPECIAL, "VerifierTest0", "<init>", "()V", false); mv.visitMethodInsn(INVOKESPECIAL, "VerifierTest0", "<init>", "()V", false);
mv.visitFieldInsn(PUTSTATIC, "UnverifiableBase", "x", "LVerifierTest;"); mv.visitFieldInsn(PUTSTATIC, "UnverifiableBase", "x", "LVerifierTest;");
@ -305,6 +304,7 @@ public class VerifierTest implements Opcodes {
mv.visitMaxs(2, 0); mv.visitMaxs(2, 0);
mv.visitEnd(); mv.visitEnd();
} }
addBadMethod(cw);
cw.visitEnd(); cw.visitEnd();
return cw.toByteArray(); return cw.toByteArray();
@ -317,7 +317,7 @@ public class VerifierTest implements Opcodes {
MethodVisitor mv; MethodVisitor mv;
AnnotationVisitor av0; AnnotationVisitor av0;
cw.visit(V1_6, ACC_ABSTRACT + ACC_INTERFACE, "UnverifiableIntf", null, "java/lang/Object", null); cw.visit(V1_8, ACC_ABSTRACT + ACC_INTERFACE, "UnverifiableIntf", null, "java/lang/Object", null);
{ {
fv = cw.visitField(ACC_PUBLIC + ACC_FINAL + ACC_STATIC, "x", "LVerifierTest0;", null, null); fv = cw.visitField(ACC_PUBLIC + ACC_FINAL + ACC_STATIC, "x", "LVerifierTest0;", null, null);
@ -326,8 +326,7 @@ public class VerifierTest implements Opcodes {
{ {
mv = cw.visitMethod(ACC_STATIC, "<clinit>", "()V", null, null); mv = cw.visitMethod(ACC_STATIC, "<clinit>", "()V", null, null);
mv.visitCode(); mv.visitCode();
//WAS mv.visitTypeInsn(NEW, "VerifierTest"); mv.visitTypeInsn(NEW, "VerifierTest0");
mv.visitTypeInsn(NEW, "java/lang/Object");
mv.visitInsn(DUP); mv.visitInsn(DUP);
mv.visitMethodInsn(INVOKESPECIAL, "VerifierTest0", "<init>", "()V", false); mv.visitMethodInsn(INVOKESPECIAL, "VerifierTest0", "<init>", "()V", false);
mv.visitFieldInsn(PUTSTATIC, "UnverifiableIntf", "x", "LVerifierTest0;"); mv.visitFieldInsn(PUTSTATIC, "UnverifiableIntf", "x", "LVerifierTest0;");
@ -335,9 +334,18 @@ public class VerifierTest implements Opcodes {
mv.visitMaxs(2, 0); mv.visitMaxs(2, 0);
mv.visitEnd(); mv.visitEnd();
} }
addBadMethod(cw);
cw.visitEnd(); cw.visitEnd();
return cw.toByteArray(); return cw.toByteArray();
} }
// Add a bad method to make the class fail verification.
static void addBadMethod(ClassWriter cw) throws Exception {
MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "bad", "()V", null, null);
mv.visitCode();
mv.visitInsn(ARETURN); // java.lang.VerifyError: Operand stack underflow
mv.visitMaxs(2, 2);
mv.visitEnd();
}
} }