Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/heapRegion.hpp @ 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 e635a728f9da
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 2001, 2013, 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.
59 (_hr_)->hrs_index(), \ 59 (_hr_)->hrs_index(), \
60 (_hr_)->is_survivor() ? "S" : (_hr_)->is_young() ? "E" : \ 60 (_hr_)->is_survivor() ? "S" : (_hr_)->is_young() ? "E" : \
61 (_hr_)->startsHumongous() ? "HS" : \ 61 (_hr_)->startsHumongous() ? "HS" : \
62 (_hr_)->continuesHumongous() ? "HC" : \ 62 (_hr_)->continuesHumongous() ? "HC" : \
63 !(_hr_)->is_empty() ? "O" : "F", \ 63 !(_hr_)->is_empty() ? "O" : "F", \
64 (_hr_)->bottom(), (_hr_)->top(), (_hr_)->end() 64 p2i((_hr_)->bottom()), p2i((_hr_)->top()), p2i((_hr_)->end())
65 65
66 // sentinel value for hrs_index 66 // sentinel value for hrs_index
67 #define G1_NULL_HRS_INDEX ((uint) -1) 67 #define G1_NULL_HRS_INDEX ((uint) -1)
68 68
69 // A dirty card to oop closure for heap regions. It 69 // A dirty card to oop closure for heap regions. It
548 void set_containing_set(HeapRegionSetBase* containing_set) { 548 void set_containing_set(HeapRegionSetBase* containing_set) {
549 assert((containing_set == NULL && _containing_set != NULL) || 549 assert((containing_set == NULL && _containing_set != NULL) ||
550 (containing_set != NULL && _containing_set == NULL), 550 (containing_set != NULL && _containing_set == NULL),
551 err_msg("containing_set: "PTR_FORMAT" " 551 err_msg("containing_set: "PTR_FORMAT" "
552 "_containing_set: "PTR_FORMAT, 552 "_containing_set: "PTR_FORMAT,
553 containing_set, _containing_set)); 553 p2i(containing_set), p2i(_containing_set)));
554 554
555 _containing_set = containing_set; 555 _containing_set = containing_set;
556 } 556 }
557 557
558 HeapRegionSetBase* containing_set() { return _containing_set; } 558 HeapRegionSetBase* containing_set() { return _containing_set; }