mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 03:58:21 +00:00
8367368: Add message for verify_legal_class_modifiers for inner classes
Reviewed-by: dholmes, fparain
This commit is contained in:
Coleen Phillimore
parent
4e59c63ec5
commit
84aa295227
@ -3017,7 +3017,9 @@ u2 ClassFileParser::parse_classfile_inner_classes_attribute(const ClassFileStrea
|
||||
// Set abstract bit for old class files for backward compatibility
|
||||
flags |= JVM_ACC_ABSTRACT;
|
||||
}
|
||||
verify_legal_class_modifiers(flags, CHECK_0);
|
||||
|
||||
Symbol* inner_name_symbol = inner_name_index == 0 ? nullptr : cp->symbol_at(inner_name_index);
|
||||
verify_legal_class_modifiers(flags, inner_name_symbol, inner_name_index == 0, CHECK_0);
|
||||
AccessFlags inner_access_flags(flags);
|
||||
|
||||
inner_classes->at_put(index++, inner_class_info_index);
|
||||
@ -4272,7 +4274,8 @@ static void check_illegal_static_method(const InstanceKlass* this_klass, TRAPS)
|
||||
|
||||
// utility methods for format checking
|
||||
|
||||
void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) const {
|
||||
// Verify the class modifiers for the current class, or an inner class if inner_name is non-null.
|
||||
void ClassFileParser::verify_legal_class_modifiers(jint flags, Symbol* inner_name, bool is_anonymous_inner_class, TRAPS) const {
|
||||
const bool is_module = (flags & JVM_ACC_MODULE) != 0;
|
||||
assert(_major_version >= JAVA_9_VERSION || !is_module, "JVM_ACC_MODULE should not be set");
|
||||
if (is_module) {
|
||||
@ -4302,12 +4305,30 @@ void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) const {
|
||||
(!is_interface && major_gte_1_5 && is_annotation)) {
|
||||
ResourceMark rm(THREAD);
|
||||
// Names are all known to be < 64k so we know this formatted message is not excessively large.
|
||||
Exceptions::fthrow(
|
||||
THREAD_AND_LOCATION,
|
||||
vmSymbols::java_lang_ClassFormatError(),
|
||||
"Illegal class modifiers in class %s: 0x%X",
|
||||
_class_name->as_C_string(), flags
|
||||
);
|
||||
if (inner_name == nullptr && !is_anonymous_inner_class) {
|
||||
Exceptions::fthrow(
|
||||
THREAD_AND_LOCATION,
|
||||
vmSymbols::java_lang_ClassFormatError(),
|
||||
"Illegal class modifiers in class %s: 0x%X",
|
||||
_class_name->as_C_string(), flags
|
||||
);
|
||||
} else {
|
||||
if (is_anonymous_inner_class) {
|
||||
Exceptions::fthrow(
|
||||
THREAD_AND_LOCATION,
|
||||
vmSymbols::java_lang_ClassFormatError(),
|
||||
"Illegal class modifiers in anonymous inner class of class %s: 0x%X",
|
||||
_class_name->as_C_string(), flags
|
||||
);
|
||||
} else {
|
||||
Exceptions::fthrow(
|
||||
THREAD_AND_LOCATION,
|
||||
vmSymbols::java_lang_ClassFormatError(),
|
||||
"Illegal class modifiers in inner class %s of class %s: 0x%X",
|
||||
inner_name->as_C_string(), _class_name->as_C_string(), flags
|
||||
);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -5568,7 +5589,7 @@ void ClassFileParser::parse_stream(const ClassFileStream* const stream,
|
||||
flags |= JVM_ACC_ABSTRACT;
|
||||
}
|
||||
|
||||
verify_legal_class_modifiers(flags, CHECK);
|
||||
verify_legal_class_modifiers(flags, nullptr, false, CHECK);
|
||||
|
||||
short bad_constant = class_bad_constant_seen();
|
||||
if (bad_constant != 0) {
|
||||
|
||||
@ -432,7 +432,8 @@ class ClassFileParser {
|
||||
|
||||
void verify_class_version(u2 major, u2 minor, Symbol* class_name, TRAPS);
|
||||
|
||||
void verify_legal_class_modifiers(jint flags, TRAPS) const;
|
||||
void verify_legal_class_modifiers(jint flags, Symbol* inner_name,
|
||||
bool is_anonymous_inner_class, TRAPS) const;
|
||||
void verify_legal_field_modifiers(jint flags, bool is_interface, TRAPS) const;
|
||||
void verify_legal_method_modifiers(jint flags,
|
||||
bool is_interface,
|
||||
|
||||
113
test/hotspot/jtreg/runtime/InnerClassesAttr/OuterTest1.jcod
Normal file
113
test/hotspot/jtreg/runtime/InnerClassesAttr/OuterTest1.jcod
Normal file
@ -0,0 +1,113 @@
|
||||
/*
|
||||
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
class OuterTest1 {
|
||||
class Inner {
|
||||
public void foo() { System.out.println("Inner.foo"); }
|
||||
};
|
||||
}
|
||||
|
||||
Nested class acccess flags are made invalid in this jcod file.
|
||||
*/
|
||||
|
||||
class OuterTest1 {
|
||||
0xCAFEBABE;
|
||||
0; // minor version
|
||||
70; // version
|
||||
[] { // Constant Pool
|
||||
; // first element is empty
|
||||
Method #2 #3; // #1
|
||||
class #4; // #2
|
||||
NameAndType #5 #6; // #3
|
||||
Utf8 "java/lang/Object"; // #4
|
||||
Utf8 "<init>"; // #5
|
||||
Utf8 "()V"; // #6
|
||||
class #8; // #7
|
||||
Utf8 "OuterTest1"; // #8
|
||||
Utf8 "Code"; // #9
|
||||
Utf8 "LineNumberTable"; // #10
|
||||
Utf8 "SourceFile"; // #11
|
||||
Utf8 "OuterTest1.java"; // #12
|
||||
Utf8 "NestMembers"; // #13
|
||||
class #15; // #14
|
||||
Utf8 "OuterTest1$Inner"; // #15
|
||||
Utf8 "InnerClasses"; // #16
|
||||
Utf8 "Inner"; // #17
|
||||
} // Constant Pool
|
||||
|
||||
0x0020; // access
|
||||
#7;// this_cpx
|
||||
#2;// super_cpx
|
||||
|
||||
[] { // Interfaces
|
||||
} // Interfaces
|
||||
|
||||
[] { // Fields
|
||||
} // Fields
|
||||
|
||||
[] { // Methods
|
||||
{ // method
|
||||
0x0000; // access
|
||||
#5; // name_index
|
||||
#6; // descriptor_index
|
||||
[] { // Attributes
|
||||
Attr(#9) { // Code
|
||||
1; // max_stack
|
||||
1; // max_locals
|
||||
Bytes[]{
|
||||
0x2AB70001B1;
|
||||
}
|
||||
[] { // Traps
|
||||
} // end Traps
|
||||
[] { // Attributes
|
||||
Attr(#10) { // LineNumberTable
|
||||
[] { // line_number_table
|
||||
0 3;
|
||||
}
|
||||
} // end LineNumberTable
|
||||
} // Attributes
|
||||
} // end Code
|
||||
} // Attributes
|
||||
}
|
||||
} // Methods
|
||||
|
||||
[] { // Attributes
|
||||
Attr(#11) { // SourceFile
|
||||
#12;
|
||||
} // end SourceFile
|
||||
;
|
||||
Attr(#13) { // NestMembers
|
||||
[] { // classes
|
||||
#14;
|
||||
}
|
||||
} // end NestMembers
|
||||
;
|
||||
Attr(#16) { // InnerClasses
|
||||
[] { // classes
|
||||
#14 #7 #17 0x0fff; // This access flag sets is_interface & is_final, so invalid.
|
||||
}
|
||||
} // end InnerClasses
|
||||
} // Attributes
|
||||
} // end class OuterTest1
|
||||
169
test/hotspot/jtreg/runtime/InnerClassesAttr/OuterTest2.jcod
Normal file
169
test/hotspot/jtreg/runtime/InnerClassesAttr/OuterTest2.jcod
Normal file
@ -0,0 +1,169 @@
|
||||
/*
|
||||
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
class OuterTest2 {
|
||||
interface Greeting {
|
||||
void sayHello();
|
||||
}
|
||||
|
||||
public static void test2() throws ClassFormatError {
|
||||
Greeting greeting = new Greeting() {
|
||||
@Override
|
||||
public void sayHello() {
|
||||
System.out.println("Hello from an anonymous inner class!");
|
||||
}
|
||||
};
|
||||
|
||||
greeting.sayHello(); // Calls the method in the anonymous inner class
|
||||
}
|
||||
}
|
||||
|
||||
Nested class acccess flags are made invalid in this jcod file, the inner class is unnamed.
|
||||
*/
|
||||
|
||||
class OuterTest2 {
|
||||
0xCAFEBABE;
|
||||
0; // minor version
|
||||
70; // version
|
||||
[] { // Constant Pool
|
||||
; // first element is empty
|
||||
Method #2 #3; // #1
|
||||
class #4; // #2
|
||||
NameAndType #5 #6; // #3
|
||||
Utf8 "java/lang/Object"; // #4
|
||||
Utf8 "<init>"; // #5
|
||||
Utf8 "()V"; // #6
|
||||
class #8; // #7
|
||||
Utf8 "OuterTest2$1"; // #8
|
||||
Method #7 #3; // #9
|
||||
InterfaceMethod #11 #12; // #10
|
||||
class #13; // #11
|
||||
NameAndType #14 #6; // #12
|
||||
Utf8 "OuterTest2$Greeting"; // #13
|
||||
Utf8 "sayHello"; // #14
|
||||
class #16; // #15
|
||||
Utf8 "OuterTest2"; // #16
|
||||
Utf8 "Code"; // #17
|
||||
Utf8 "LineNumberTable"; // #18
|
||||
Utf8 "test2"; // #19
|
||||
Utf8 "Exceptions"; // #20
|
||||
class #22; // #21
|
||||
Utf8 "java/lang/ClassFormatError"; // #22
|
||||
Utf8 "SourceFile"; // #23
|
||||
Utf8 "OuterTest2.java"; // #24
|
||||
Utf8 "NestMembers"; // #25
|
||||
Utf8 "InnerClasses"; // #26
|
||||
Utf8 "Greeting"; // #27
|
||||
} // Constant Pool
|
||||
|
||||
0x0020; // access
|
||||
#15;// this_cpx
|
||||
#2;// super_cpx
|
||||
|
||||
[] { // Interfaces
|
||||
} // Interfaces
|
||||
|
||||
[] { // Fields
|
||||
} // Fields
|
||||
|
||||
[] { // Methods
|
||||
{ // method
|
||||
0x0000; // access
|
||||
#5; // name_index
|
||||
#6; // descriptor_index
|
||||
[] { // Attributes
|
||||
Attr(#17) { // Code
|
||||
1; // max_stack
|
||||
1; // max_locals
|
||||
Bytes[]{
|
||||
0x2AB70001B1;
|
||||
}
|
||||
[] { // Traps
|
||||
} // end Traps
|
||||
[] { // Attributes
|
||||
Attr(#18) { // LineNumberTable
|
||||
[] { // line_number_table
|
||||
0 3;
|
||||
}
|
||||
} // end LineNumberTable
|
||||
} // Attributes
|
||||
} // end Code
|
||||
} // Attributes
|
||||
}
|
||||
;
|
||||
{ // method
|
||||
0x0009; // access
|
||||
#19; // name_index
|
||||
#6; // descriptor_index
|
||||
[] { // Attributes
|
||||
Attr(#17) { // Code
|
||||
2; // max_stack
|
||||
1; // max_locals
|
||||
Bytes[]{
|
||||
0xBB000759B700094B;
|
||||
0x2AB9000A0100B1;
|
||||
}
|
||||
[] { // Traps
|
||||
} // end Traps
|
||||
[] { // Attributes
|
||||
Attr(#18) { // LineNumberTable
|
||||
[] { // line_number_table
|
||||
0 9;
|
||||
8 16;
|
||||
14 17;
|
||||
}
|
||||
} // end LineNumberTable
|
||||
} // Attributes
|
||||
} // end Code
|
||||
;
|
||||
Attr(#20) { // Exceptions
|
||||
[] { // Exceptions
|
||||
#21;
|
||||
}
|
||||
} // end Exceptions
|
||||
} // Attributes
|
||||
}
|
||||
} // Methods
|
||||
|
||||
[] { // Attributes
|
||||
Attr(#23) { // SourceFile
|
||||
#24;
|
||||
} // end SourceFile
|
||||
;
|
||||
Attr(#25) { // NestMembers
|
||||
[] { // classes
|
||||
#11;
|
||||
#7;
|
||||
}
|
||||
} // end NestMembers
|
||||
;
|
||||
Attr(#26) { // InnerClasses
|
||||
[] { // classes
|
||||
#7 #0 #0 0x0fff; // This access flag sets is_interface & is_final, so invalid.
|
||||
#11 #15 #27 1544;
|
||||
}
|
||||
} // end InnerClasses
|
||||
} // Attributes
|
||||
} // end class OuterTest2
|
||||
@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8079784
|
||||
* @summary Test that CFE with bad inner class attribute has a nice message.
|
||||
* @library /test/lib
|
||||
* @compile OuterTest1.jcod OuterTest2.jcod
|
||||
* @run main TestInnerClassAccessFlagErrorMessage
|
||||
*/
|
||||
|
||||
import static jdk.test.lib.Asserts.*;
|
||||
|
||||
public class TestInnerClassAccessFlagErrorMessage {
|
||||
|
||||
static String msg1 = "inner class Inner";
|
||||
static String msg2 = "anonymous inner class";
|
||||
|
||||
public static void main(java.lang.String[] unused) {
|
||||
try {
|
||||
Class<?> outer = Class.forName("OuterTest1");
|
||||
fail("Should not reach here");
|
||||
} catch (ClassFormatError err) {
|
||||
System.out.println(err.getMessage());
|
||||
assertTrue(err.getMessage().contains(msg1));
|
||||
} catch (ClassNotFoundException cfne) {
|
||||
cfne.printStackTrace();
|
||||
fail("Should not reach here");
|
||||
}
|
||||
|
||||
try {
|
||||
Class<?> outer = Class.forName("OuterTest2");
|
||||
fail("Should not reach here");
|
||||
} catch (ClassFormatError err) {
|
||||
System.out.println(err.getMessage());
|
||||
assertTrue(err.getMessage().contains(msg2));
|
||||
} catch (ClassNotFoundException cfne) {
|
||||
cfne.printStackTrace();
|
||||
fail("Should not reach here");
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user