Mercurial > hg > truffle
comparison src/share/vm/runtime/vframe.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 | 55fb97c4c58d |
children | 4a1062dc52d1 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2013, 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. |
44 #include "runtime/synchronizer.hpp" | 44 #include "runtime/synchronizer.hpp" |
45 #include "runtime/vframe.hpp" | 45 #include "runtime/vframe.hpp" |
46 #include "runtime/vframeArray.hpp" | 46 #include "runtime/vframeArray.hpp" |
47 #include "runtime/vframe_hp.hpp" | 47 #include "runtime/vframe_hp.hpp" |
48 | 48 |
49 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
50 | |
49 vframe::vframe(const frame* fr, const RegisterMap* reg_map, JavaThread* thread) | 51 vframe::vframe(const frame* fr, const RegisterMap* reg_map, JavaThread* thread) |
50 : _reg_map(reg_map), _thread(thread) { | 52 : _reg_map(reg_map), _thread(thread) { |
51 assert(fr != NULL, "must have frame"); | 53 assert(fr != NULL, "must have frame"); |
52 _fr = *fr; | 54 _fr = *fr; |
53 } | 55 } |