Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/g1/heapRegionRemSet.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 | 8847586c9037 |
children | ff7b317d2af8 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
33 #include "memory/space.inline.hpp" | 33 #include "memory/space.inline.hpp" |
34 #include "oops/oop.inline.hpp" | 34 #include "oops/oop.inline.hpp" |
35 #include "utilities/bitMap.inline.hpp" | 35 #include "utilities/bitMap.inline.hpp" |
36 #include "utilities/globalDefinitions.hpp" | 36 #include "utilities/globalDefinitions.hpp" |
37 #include "utilities/growableArray.hpp" | 37 #include "utilities/growableArray.hpp" |
38 | |
39 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
38 | 40 |
39 class PerRegionTable: public CHeapObj<mtGC> { | 41 class PerRegionTable: public CHeapObj<mtGC> { |
40 friend class OtherRegionsTable; | 42 friend class OtherRegionsTable; |
41 friend class HeapRegionRemSetIterator; | 43 friend class HeapRegionRemSetIterator; |
42 | 44 |
1242 | 1244 |
1243 for (int i = 0; i < _n_recorded; i++) { | 1245 for (int i = 0; i < _n_recorded; i++) { |
1244 while (cur_evnt < _n_recorded_events && i == cur_evnt_ind) { | 1246 while (cur_evnt < _n_recorded_events && i == cur_evnt_ind) { |
1245 gclog_or_tty->print("Event: "); | 1247 gclog_or_tty->print("Event: "); |
1246 print_event(gclog_or_tty, cur_evnt_kind); | 1248 print_event(gclog_or_tty, cur_evnt_kind); |
1247 gclog_or_tty->print_cr(""); | 1249 gclog_or_tty->cr(); |
1248 cur_evnt++; | 1250 cur_evnt++; |
1249 if (cur_evnt < MaxRecordedEvents) { | 1251 if (cur_evnt < MaxRecordedEvents) { |
1250 cur_evnt_kind = _recorded_events[cur_evnt]; | 1252 cur_evnt_kind = _recorded_events[cur_evnt]; |
1251 cur_evnt_ind = _recorded_event_index[cur_evnt]; | 1253 cur_evnt_ind = _recorded_event_index[cur_evnt]; |
1252 } | 1254 } |