Mercurial > hg > truffle
comparison src/share/vm/runtime/deoptimization.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 | 0bf37f737702 |
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. |
86 #endif | 86 #endif |
87 #ifdef TARGET_ARCH_MODEL_ppc_64 | 87 #ifdef TARGET_ARCH_MODEL_ppc_64 |
88 # include "adfiles/ad_ppc_64.hpp" | 88 # include "adfiles/ad_ppc_64.hpp" |
89 #endif | 89 #endif |
90 #endif // COMPILER2 | 90 #endif // COMPILER2 |
91 | |
92 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
91 | 93 |
92 bool DeoptimizationMarker::_is_active = false; | 94 bool DeoptimizationMarker::_is_active = false; |
93 | 95 |
94 Deoptimization::UnrollBlock::UnrollBlock(int size_of_deoptimized_frame, | 96 Deoptimization::UnrollBlock::UnrollBlock(int size_of_deoptimized_frame, |
95 int caller_adjustment, | 97 int caller_adjustment, |