Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 89152779163c 78bbf4d43a14 |
children |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
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 |