Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/g1CardCounts.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 d55c004e1d4d
children 52b4284cb496 1f1d373cd044
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2013, 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.
28 #include "gc_implementation/g1/g1CollectorPolicy.hpp" 28 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
29 #include "gc_implementation/g1/g1GCPhaseTimes.hpp" 29 #include "gc_implementation/g1/g1GCPhaseTimes.hpp"
30 #include "memory/cardTableModRefBS.hpp" 30 #include "memory/cardTableModRefBS.hpp"
31 #include "services/memTracker.hpp" 31 #include "services/memTracker.hpp"
32 #include "utilities/copy.hpp" 32 #include "utilities/copy.hpp"
33
34 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
33 35
34 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { 36 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
35 if (has_count_table()) { 37 if (has_count_table()) {
36 assert(from_card_num >= 0 && from_card_num < _committed_max_card_num, 38 assert(from_card_num >= 0 && from_card_num < _committed_max_card_num,
37 err_msg("from card num out of range: "SIZE_FORMAT, from_card_num)); 39 err_msg("from card num out of range: "SIZE_FORMAT, from_card_num));