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

8208604: Metadata::print_value_string() compares 'this' to NULL

Browse Source 
Remove the comparison and add asserts to check for NULL

Reviewed-by: coleenp, gziemski
This commit is contained in:
Harold Seigel 2018-08-06 14:20:58 -04:00
parent 831fdfe311
commit 82186ce311
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/share/c1/c1_Runtime1.cpp
View File

@ -568,6 +568,7 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
if (log_is_enabled(Info, exceptions)) {
ResourceMark rm;
stringStream tempst;
assert(nm->method() != NULL, "Unexpected NULL method()");
tempst.print("compiled method <%s>\n"
" at PC" INTPTR_FORMAT " for thread " INTPTR_FORMAT,
nm->method()->print_value_string(), p2i(pc), p2i(thread));

1
src/hotspot/share/code/compiledIC.cpp
View File

@ -252,6 +252,7 @@ bool CompiledIC::set_to_megamorphic(CallInfo* call_info, Bytecodes::Code bytecod
if (TraceICs) {
ResourceMark rm;
assert(!call_info->selected_method().is_null(), "Unexpected null selected method");
tty->print_cr ("IC@" INTPTR_FORMAT ": to megamorphic %s entry: " INTPTR_FORMAT,
p2i(instruction_address()), call_info->selected_method()->print_value_string(), p2i(entry));
}

1
src/hotspot/share/jvmci/jvmciRuntime.cpp
View File

@ -281,6 +281,7 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
if (log_is_enabled(Info, exceptions)) {
ResourceMark rm;
stringStream tempst;
assert(cm->method() != NULL, "Unexpected null method()");
tempst.print("compiled method <%s>\n"
" at PC" INTPTR_FORMAT " for thread " INTPTR_FORMAT,
cm->method()->print_value_string(), p2i(pc), p2i(thread));

8
src/hotspot/share/oops/metadata.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2018, 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
@ -44,10 +44,6 @@ void Metadata::print_on(outputStream* st) const {
char* Metadata::print_value_string() const {
char buf[256];
stringStream st(buf, sizeof(buf));
if (this == NULL) {
st.print("NULL");
} else {
print_value_on(&st);
}
print_value_on(&st);
return st.as_string();
}