Mercurial > hg > graal-jvmci-8
comparison src/share/vm/oops/methodData.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 | 62c54fcc0a35 |
children | 52b4284cb496 ce8f6bb717c9 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
32 #include "oops/methodData.hpp" | 32 #include "oops/methodData.hpp" |
33 #include "prims/jvmtiRedefineClasses.hpp" | 33 #include "prims/jvmtiRedefineClasses.hpp" |
34 #include "runtime/compilationPolicy.hpp" | 34 #include "runtime/compilationPolicy.hpp" |
35 #include "runtime/deoptimization.hpp" | 35 #include "runtime/deoptimization.hpp" |
36 #include "runtime/handles.inline.hpp" | 36 #include "runtime/handles.inline.hpp" |
37 | |
38 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
37 | 39 |
38 // ================================================================== | 40 // ================================================================== |
39 // DataLayout | 41 // DataLayout |
40 // | 42 // |
41 // Overlay for generic profiling data. | 43 // Overlay for generic profiling data. |
125 if (trap != 0) { | 127 if (trap != 0) { |
126 char buf[100]; | 128 char buf[100]; |
127 st->print("trap(%s) ", Deoptimization::format_trap_state(buf, sizeof(buf), trap)); | 129 st->print("trap(%s) ", Deoptimization::format_trap_state(buf, sizeof(buf), trap)); |
128 } | 130 } |
129 if (extra != NULL) { | 131 if (extra != NULL) { |
130 st->print(extra); | 132 st->print("%s", extra); |
131 } | 133 } |
132 int flags = data()->flags(); | 134 int flags = data()->flags(); |
133 if (flags != 0) { | 135 if (flags != 0) { |
134 st->print("flags(%d) ", flags); | 136 st->print("flags(%d) ", flags); |
135 } | 137 } |
654 return MethodData::profile_parameters(); | 656 return MethodData::profile_parameters(); |
655 } | 657 } |
656 | 658 |
657 #ifndef PRODUCT | 659 #ifndef PRODUCT |
658 void ParametersTypeData::print_data_on(outputStream* st, const char* extra) const { | 660 void ParametersTypeData::print_data_on(outputStream* st, const char* extra) const { |
659 st->print("parameter types", extra); | 661 st->print("parameter types"); // FIXME extra ignored? |
660 _parameters.print_data_on(st); | 662 _parameters.print_data_on(st); |
661 } | 663 } |
662 | 664 |
663 void SpeculativeTrapData::print_data_on(outputStream* st, const char* extra) const { | 665 void SpeculativeTrapData::print_data_on(outputStream* st, const char* extra) const { |
664 print_shared(st, "SpeculativeTrapData", extra); | 666 print_shared(st, "SpeculativeTrapData", extra); |