Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8264142: Remove TRAPS/THREAD parameters for verifier related functions #3194

Closed
wants to merge 4 commits into from
Closed
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

@@ -135,11 +135,9 @@ void Verifier::trace_class_resolution(Klass* resolve_class, InstanceKlass* verif

// Prints the end-verification message to the appropriate output.
void Verifier::log_end_verification(outputStream* st, const char* klassName, Symbol* exception_name, oop pending_exception) {
Thread* THREAD = Thread::current();

if (pending_exception != NULL) {
st->print("Verification for %s has", klassName);
oop message = java_lang_Throwable::message(PENDING_EXCEPTION);
oop message = java_lang_Throwable::message(pending_exception);
if (message != NULL) {
char* ex_msg = java_lang_String::as_utf8_string(message);
st->print_cr(" exception pending '%s %s'",
@@ -195,7 +193,8 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {

log_info(class, init)("Start class verification for: %s", klass->external_name());
if (klass->major_version() >= STACKMAP_ATTRIBUTE_MAJOR_VERSION) {
ClassVerifier split_verifier(THREAD->as_Java_thread(), klass);
ClassVerifier split_verifier(jt, klass);
// We don't use CHECK here, or on inference_verify below, so that we can log any exception.
split_verifier.verify_class(THREAD);

This comment has been minimized.

@dholmes-ora

dholmes-ora Mar 26, 2021
Member

Can you add the following comment before verify_class please

// We don't use CHECK here, or on inference_verify below, so that we can log any exception.

Thanks

This comment has been minimized.

@hseigel

hseigel Mar 26, 2021
Author Member

done, thanks for suggesting this.

exception_name = split_verifier.result();

@@ -617,6 +616,7 @@ TypeOrigin ClassVerifier::ref_ctx(const char* sig) {
return TypeOrigin::implicit(vt);
}


void ClassVerifier::verify_class(TRAPS) {
log_info(verification)("Verifying class %s with new format", _klass->external_name());

ProTip! Use n and p to navigate between commits in a pull request.