Mercurial > hg > graal-compiler
comparison src/share/vm/gc_implementation/g1/heapRegionSeq.inline.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 | 55fb97c4c58d |
children | 52b4284cb496 eec72fa4b108 |
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. |
35 } | 35 } |
36 | 36 |
37 inline HeapRegion* HeapRegionSeq::addr_to_region(HeapWord* addr) const { | 37 inline HeapRegion* HeapRegionSeq::addr_to_region(HeapWord* addr) const { |
38 if (addr != NULL && addr < heap_end()) { | 38 if (addr != NULL && addr < heap_end()) { |
39 assert(addr >= heap_bottom(), | 39 assert(addr >= heap_bottom(), |
40 err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, addr, heap_bottom())); | 40 err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); |
41 return addr_to_region_unsafe(addr); | 41 return addr_to_region_unsafe(addr); |
42 } | 42 } |
43 return NULL; | 43 return NULL; |
44 } | 44 } |
45 | 45 |