Mercurial > hg > graal-jvmci-8
comparison src/share/vm/interpreter/linkResolver.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 | 386dd1c71858 |
children | 52b4284cb496 54bc75c144b0 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1628 &resolved_appendix, | 1628 &resolved_appendix, |
1629 &resolved_method_type, | 1629 &resolved_method_type, |
1630 THREAD); | 1630 THREAD); |
1631 if (HAS_PENDING_EXCEPTION) { | 1631 if (HAS_PENDING_EXCEPTION) { |
1632 if (TraceMethodHandles) { | 1632 if (TraceMethodHandles) { |
1633 tty->print_cr("invokedynamic throws BSME for "INTPTR_FORMAT, (void *)PENDING_EXCEPTION); | 1633 tty->print_cr("invokedynamic throws BSME for " INTPTR_FORMAT, p2i((void *)PENDING_EXCEPTION)); |
1634 PENDING_EXCEPTION->print(); | 1634 PENDING_EXCEPTION->print(); |
1635 } | 1635 } |
1636 if (PENDING_EXCEPTION->is_a(SystemDictionary::BootstrapMethodError_klass())) { | 1636 if (PENDING_EXCEPTION->is_a(SystemDictionary::BootstrapMethodError_klass())) { |
1637 // throw these guys, since they are already wrapped | 1637 // throw these guys, since they are already wrapped |
1638 return; | 1638 return; |