Mercurial > hg > graal-jvmci-8
comparison src/share/vm/memory/generation.hpp @ 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 | cfd4aac53239 |
children | 52b4284cb496 30c99d8e0f02 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 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. |
420 // that guarantees monotonically non-decreasing values provided | 420 // that guarantees monotonically non-decreasing values provided |
421 // the underlying platform provides such a source. So we still | 421 // the underlying platform provides such a source. So we still |
422 // have to guard against non-monotonicity. | 422 // have to guard against non-monotonicity. |
423 NOT_PRODUCT( | 423 NOT_PRODUCT( |
424 if (now < _time_of_last_gc) { | 424 if (now < _time_of_last_gc) { |
425 warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, _time_of_last_gc, now); | 425 warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); |
426 } | 426 } |
427 ) | 427 ) |
428 return _time_of_last_gc; | 428 return _time_of_last_gc; |
429 } | 429 } |
430 | 430 |