Mercurial > hg > truffle
comparison src/share/vm/oops/klassVtable.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 | f73af4455d7d |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
36 #include "oops/oop.inline.hpp" | 36 #include "oops/oop.inline.hpp" |
37 #include "prims/jvmtiRedefineClassesTrace.hpp" | 37 #include "prims/jvmtiRedefineClassesTrace.hpp" |
38 #include "runtime/arguments.hpp" | 38 #include "runtime/arguments.hpp" |
39 #include "runtime/handles.inline.hpp" | 39 #include "runtime/handles.inline.hpp" |
40 #include "utilities/copy.hpp" | 40 #include "utilities/copy.hpp" |
41 | |
42 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
41 | 43 |
42 inline InstanceKlass* klassVtable::ik() const { | 44 inline InstanceKlass* klassVtable::ik() const { |
43 Klass* k = _klass(); | 45 Klass* k = _klass(); |
44 assert(k->oop_is_instance(), "not an InstanceKlass"); | 46 assert(k->oop_is_instance(), "not an InstanceKlass"); |
45 return (InstanceKlass*)k; | 47 return (InstanceKlass*)k; |