archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Dean Long 2015-10-17 19:40:30 -04:00
commit 344a9becee
539 changed files with 51665 additions and 1091 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/classfile/javaClasses.cpp
View file

@ -53,6 +53,10 @@
#include "runtime/vframe.hpp"
#include "utilities/preserveException.hpp"
#if INCLUDE_JVMCI
#include "jvmci/jvmciJavaClasses.hpp"
#endif
#define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \
klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum);
@ -1577,7 +1581,7 @@ void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) {
while (h_throwable.not_null()) {
objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
if (result.is_null()) {
st->print_cr("%s", no_stack_trace_message());
st->print_raw_cr(no_stack_trace_message());
return;
}