Mercurial > hg > graal-jvmci-8
comparison src/share/vm/oops/markOop.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 | f34d701e952e |
children | 6e8e0bf87bbe |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 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. |
24 | 24 |
25 #include "precompiled.hpp" | 25 #include "precompiled.hpp" |
26 #include "oops/markOop.hpp" | 26 #include "oops/markOop.hpp" |
27 #include "runtime/thread.inline.hpp" | 27 #include "runtime/thread.inline.hpp" |
28 | 28 |
29 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
30 | |
29 void markOopDesc::print_on(outputStream* st) const { | 31 void markOopDesc::print_on(outputStream* st) const { |
30 if (is_locked()) { | 32 if (is_locked()) { |
31 st->print("locked(0x%lx)->", value()); | 33 st->print("locked(" INTPTR_FORMAT ")->", value()); |
32 markOop(*(markOop*)value())->print_on(st); | 34 markOop(*(markOop*)value())->print_on(st); |
33 } else { | 35 } else { |
34 assert(is_unlocked() || has_bias_pattern(), "just checking"); | 36 assert(is_unlocked() || has_bias_pattern(), "just checking"); |
35 st->print("mark("); | 37 st->print("mark("); |
36 if (has_bias_pattern()) st->print("biased,"); | 38 if (has_bias_pattern()) st->print("biased,"); |