Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 17937:78bbf4d43a14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8ee855b4e667
children 52b4284cb496 ce8f6bb717c9
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
31 #include "gc_implementation/g1/heapRegionRemSet.hpp" 31 #include "gc_implementation/g1/heapRegionRemSet.hpp"
32 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" 32 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
33 #include "memory/genOopClosures.inline.hpp" 33 #include "memory/genOopClosures.inline.hpp"
34 #include "memory/iterator.hpp" 34 #include "memory/iterator.hpp"
35 #include "oops/oop.inline.hpp" 35 #include "oops/oop.inline.hpp"
36
37 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
36 38
37 int HeapRegion::LogOfHRGrainBytes = 0; 39 int HeapRegion::LogOfHRGrainBytes = 0;
38 int HeapRegion::LogOfHRGrainWords = 0; 40 int HeapRegion::LogOfHRGrainWords = 0;
39 size_t HeapRegion::GrainBytes = 0; 41 size_t HeapRegion::GrainBytes = 0;
40 size_t HeapRegion::GrainWords = 0; 42 size_t HeapRegion::GrainWords = 0;
827 if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) { 829 if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) {
828 MutexLockerEx x(ParGCRareEvent_lock, 830 MutexLockerEx x(ParGCRareEvent_lock,
829 Mutex::_no_safepoint_check_flag); 831 Mutex::_no_safepoint_check_flag);
830 832
831 if (!_failures) { 833 if (!_failures) {
832 gclog_or_tty->print_cr(""); 834 gclog_or_tty->cr();
833 gclog_or_tty->print_cr("----------"); 835 gclog_or_tty->print_cr("----------");
834 } 836 }
835 if (!_g1h->is_in_closed_subset(obj)) { 837 if (!_g1h->is_in_closed_subset(obj)) {
836 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); 838 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
837 gclog_or_tty->print_cr("Field "PTR_FORMAT 839 gclog_or_tty->print_cr("Field "PTR_FORMAT
882 if (is_bad) { 884 if (is_bad) {
883 MutexLockerEx x(ParGCRareEvent_lock, 885 MutexLockerEx x(ParGCRareEvent_lock,
884 Mutex::_no_safepoint_check_flag); 886 Mutex::_no_safepoint_check_flag);
885 887
886 if (!_failures) { 888 if (!_failures) {
887 gclog_or_tty->print_cr(""); 889 gclog_or_tty->cr();
888 gclog_or_tty->print_cr("----------"); 890 gclog_or_tty->print_cr("----------");
889 } 891 }
890 gclog_or_tty->print_cr("Missing rem set entry:"); 892 gclog_or_tty->print_cr("Missing rem set entry:");
891 gclog_or_tty->print_cr("Field "PTR_FORMAT" " 893 gclog_or_tty->print_cr("Field "PTR_FORMAT" "
892 "of obj "PTR_FORMAT", " 894 "of obj "PTR_FORMAT", "