Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/shared/parGCAllocBuffer.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 | cfd4aac53239 |
children | 52b4284cb496 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2001, 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. |
25 #include "precompiled.hpp" | 25 #include "precompiled.hpp" |
26 #include "gc_implementation/shared/parGCAllocBuffer.hpp" | 26 #include "gc_implementation/shared/parGCAllocBuffer.hpp" |
27 #include "memory/sharedHeap.hpp" | 27 #include "memory/sharedHeap.hpp" |
28 #include "oops/arrayOop.hpp" | 28 #include "oops/arrayOop.hpp" |
29 #include "oops/oop.inline.hpp" | 29 #include "oops/oop.inline.hpp" |
30 | |
31 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
30 | 32 |
31 ParGCAllocBuffer::ParGCAllocBuffer(size_t desired_plab_sz_) : | 33 ParGCAllocBuffer::ParGCAllocBuffer(size_t desired_plab_sz_) : |
32 _word_sz(desired_plab_sz_), _bottom(NULL), _top(NULL), | 34 _word_sz(desired_plab_sz_), _bottom(NULL), _top(NULL), |
33 _end(NULL), _hard_end(NULL), | 35 _end(NULL), _hard_end(NULL), |
34 _retained(false), _retained_filler(), | 36 _retained(false), _retained_filler(), |