Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.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 | a9becfeecd1b |
children | 52b4284cb496 f40816c5e359 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2012, 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. |
155 " + split_births(" SIZE_FORMAT ")" | 155 " + split_births(" SIZE_FORMAT ")" |
156 " + coal_births(" SIZE_FORMAT ") + 1 >= " | 156 " + coal_births(" SIZE_FORMAT ") + 1 >= " |
157 " split_deaths(" SIZE_FORMAT ")" | 157 " split_deaths(" SIZE_FORMAT ")" |
158 " coal_deaths(" SIZE_FORMAT ")" | 158 " coal_deaths(" SIZE_FORMAT ")" |
159 " + count(" SSIZE_FORMAT ")", | 159 " + count(" SSIZE_FORMAT ")", |
160 this, size(), _allocation_stats.prev_sweep(), _allocation_stats.split_births(), | 160 p2i(this), size(), _allocation_stats.prev_sweep(), _allocation_stats.split_births(), |
161 _allocation_stats.split_births(), _allocation_stats.split_deaths(), | 161 _allocation_stats.split_births(), _allocation_stats.split_deaths(), |
162 _allocation_stats.coal_deaths(), count())); | 162 _allocation_stats.coal_deaths(), count())); |
163 } | 163 } |
164 #endif | 164 #endif |
165 | 165 |