Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/g1/g1RemSet.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 | 52b4284cb496 02e61cf08ab3 |
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. |
37 #include "gc_implementation/g1/heapRegionRemSet.hpp" | 37 #include "gc_implementation/g1/heapRegionRemSet.hpp" |
38 #include "memory/iterator.hpp" | 38 #include "memory/iterator.hpp" |
39 #include "oops/oop.inline.hpp" | 39 #include "oops/oop.inline.hpp" |
40 #include "utilities/intHisto.hpp" | 40 #include "utilities/intHisto.hpp" |
41 | 41 |
42 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
43 | |
42 #define CARD_REPEAT_HISTO 0 | 44 #define CARD_REPEAT_HISTO 0 |
43 | 45 |
44 #if CARD_REPEAT_HISTO | 46 #if CARD_REPEAT_HISTO |
45 static size_t ct_freq_sz; | 47 static size_t ct_freq_sz; |
46 static jbyte* ct_freq = NULL; | 48 static jbyte* ct_freq = NULL; |