Mercurial > hg > graal-compiler
comparison src/share/vm/gc_implementation/g1/g1CardCounts.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 4ca6dc0799b6 78bbf4d43a14 |
children | 7848fc12602b |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
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)); |