Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parNew/parCardTableModRefBS.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 | 52b4284cb496 ce8f6bb717c9 |
comparison
equal
deleted
inserted
replaced
| 17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2007, 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/oop.inline.hpp" | 32 #include "oops/oop.inline.hpp" |
| 33 #include "runtime/java.hpp" | 33 #include "runtime/java.hpp" |
| 34 #include "runtime/mutexLocker.hpp" | 34 #include "runtime/mutexLocker.hpp" |
| 35 #include "runtime/virtualspace.hpp" | 35 #include "runtime/virtualspace.hpp" |
| 36 #include "runtime/vmThread.hpp" | 36 #include "runtime/vmThread.hpp" |
| 37 | |
| 38 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
| 37 | 39 |
| 38 void CardTableModRefBS::non_clean_card_iterate_parallel_work(Space* sp, MemRegion mr, | 40 void CardTableModRefBS::non_clean_card_iterate_parallel_work(Space* sp, MemRegion mr, |
| 39 OopsInGenClosure* cl, | 41 OopsInGenClosure* cl, |
| 40 CardTableRS* ct, | 42 CardTableRS* ct, |
| 41 int n_threads) { | 43 int n_threads) { |