Mercurial > hg > truffle
diff src/share/vm/classfile/classFileParser.cpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | d8041d695d19 |
children | 0563b652c052 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/classfile/classFileParser.cpp Tue Apr 01 13:57:07 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -3746,24 +3746,18 @@ Exceptions::fthrow( THREAD_AND_LOCATION, vmSymbols::java_lang_UnsupportedClassVersionError(), - "Unsupported class file version %u.%u, " - "this version of the Java Runtime only recognizes class file versions up to %u.%u", + "Unsupported major.minor version %u.%u", major_version, - minor_version, - JAVA_MAX_SUPPORTED_VERSION, - JAVA_MAX_SUPPORTED_MINOR_VERSION); + minor_version); } else { ResourceMark rm(THREAD); Exceptions::fthrow( THREAD_AND_LOCATION, vmSymbols::java_lang_UnsupportedClassVersionError(), - "%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), " - "this version of the Java Runtime only recognizes class file versions up to %u.%u", + "%s : Unsupported major.minor version %u.%u", name->as_C_string(), major_version, - minor_version, - JAVA_MAX_SUPPORTED_VERSION, - JAVA_MAX_SUPPORTED_MINOR_VERSION); + minor_version); } return nullHandle; } @@ -4104,12 +4098,8 @@ tty->print("[Loaded %s from %s]\n", this_klass->external_name(), cfs->source()); } else if (class_loader.is_null()) { - Klass* caller = - THREAD->is_Java_thread() - ? ((JavaThread*)THREAD)->security_get_caller_class(1) - : NULL; - // caller can be NULL, for example, during a JVMTI VM_Init hook - if (caller != NULL) { + if (THREAD->is_Java_thread()) { + Klass* caller = ((JavaThread*)THREAD)->security_get_caller_class(1); tty->print("[Loaded %s by instance of %s]\n", this_klass->external_name(), InstanceKlass::cast(caller)->external_name()); @@ -4510,8 +4500,8 @@ break; // didn't find any match; get out } - if (super_m->is_final() && !super_m->is_static() && - // matching method in super is final, and not static + if (super_m->is_final() && + // matching method in super is final (Reflection::verify_field_access(this_klass(), super_m->method_holder(), super_m->method_holder(),