Skip to content

Commit ca62ba5

Browse files
committed
8214807: Improve handling of very old class files
Remove old version specific code in reflection.cpp Reviewed-by: clanger Backport-of: 145582d
1 parent b46e240 commit ca62ba5

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/hotspot/share/classfile/verifier.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
class Verifier : AllStatic {
3737
public:
3838
enum {
39-
STRICTER_ACCESS_CTRL_CHECK_VERSION = 49,
4039
STACKMAP_ATTRIBUTE_MAJOR_VERSION = 50,
4140
INVOKEDYNAMIC_MAJOR_VERSION = 51,
4241
NO_RELAX_ACCESS_CTRL_CHECK_VERSION = 52,

src/hotspot/share/runtime/reflection.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,11 +453,9 @@ static bool can_relax_access_check_for(const Klass* accessor,
453453
under_host_klass(accessee_ik, accessor_ik))
454454
return true;
455455

456-
if ((RelaxAccessControlCheck &&
456+
if (RelaxAccessControlCheck &&
457457
accessor_ik->major_version() < Verifier::NO_RELAX_ACCESS_CTRL_CHECK_VERSION &&
458-
accessee_ik->major_version() < Verifier::NO_RELAX_ACCESS_CTRL_CHECK_VERSION) ||
459-
(accessor_ik->major_version() < Verifier::STRICTER_ACCESS_CTRL_CHECK_VERSION &&
460-
accessee_ik->major_version() < Verifier::STRICTER_ACCESS_CTRL_CHECK_VERSION)) {
458+
accessee_ik->major_version() < Verifier::NO_RELAX_ACCESS_CTRL_CHECK_VERSION) {
461459
return classloader_only &&
462460
Verifier::relax_access_for(accessor_ik->class_loader()) &&
463461
accessor_ik->protection_domain() == accessee_ik->protection_domain() &&

0 commit comments

Comments
 (0)