Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp @ 14518:d8041d695d19
Merged with jdk9/dev/hotspot changeset 3812c088b945
author | twisti |
---|---|
date | Tue, 11 Mar 2014 18:45:59 -0700 |
parents | 63a4eb8bcd23 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14141:f97c5ec83832 | 14518:d8041d695d19 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2001, 2013, 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. |
446 return ub; | 446 return ub; |
447 } | 447 } |
448 | 448 |
449 // Otherwise, find the block start using the table, but taking | 449 // Otherwise, find the block start using the table, but taking |
450 // care (cf block_start_unsafe() above) not to parse any objects/blocks | 450 // care (cf block_start_unsafe() above) not to parse any objects/blocks |
451 // on the cards themsleves. | 451 // on the cards themselves. |
452 size_t index = _array->index_for(addr); | 452 size_t index = _array->index_for(addr); |
453 assert(_array->address_for_index(index) == addr, | 453 assert(_array->address_for_index(index) == addr, |
454 "arg should be start of card"); | 454 "arg should be start of card"); |
455 | 455 |
456 HeapWord* q = (HeapWord*)addr; | 456 HeapWord* q = (HeapWord*)addr; |