comparison src/share/vm/classfile/javaClasses.cpp @ 17937:78bbf4d43a14

8037816: Fix for 8036122 breaks build with Xcode5/clang 8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas 8043164: Format warning in traceStream.hpp Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings Reviewed-by: kvn, coleenp, iveresov, twisti
author drchase
date Thu, 22 May 2014 15:52:41 -0400
parents 9428a0b94204
children 52b4284cb496 27188ae8bbbb
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
48 #include "runtime/javaCalls.hpp" 48 #include "runtime/javaCalls.hpp"
49 #include "runtime/safepoint.hpp" 49 #include "runtime/safepoint.hpp"
50 #include "runtime/thread.inline.hpp" 50 #include "runtime/thread.inline.hpp"
51 #include "runtime/vframe.hpp" 51 #include "runtime/vframe.hpp"
52 #include "utilities/preserveException.hpp" 52 #include "utilities/preserveException.hpp"
53
54 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
53 55
54 #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ 56 #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \
55 klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); 57 klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum);
56 58
57 #define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java) \ 59 #define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java) \
1479 Thread *THREAD = Thread::current(); 1481 Thread *THREAD = Thread::current();
1480 Handle h_throwable(THREAD, throwable); 1482 Handle h_throwable(THREAD, throwable);
1481 while (h_throwable.not_null()) { 1483 while (h_throwable.not_null()) {
1482 objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable()))); 1484 objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
1483 if (result.is_null()) { 1485 if (result.is_null()) {
1484 st->print_cr(no_stack_trace_message()); 1486 st->print_cr("%s", no_stack_trace_message());
1485 return; 1487 return;
1486 } 1488 }
1487 1489
1488 while (result.not_null()) { 1490 while (result.not_null()) {
1489 1491