Mercurial > hg > truffle
comparison src/share/vm/compiler/oopMap.cpp @ 12873:4e7f99b70d9d
Merge
author | adlertz |
---|---|
date | Wed, 09 Oct 2013 05:03:34 -0700 |
parents | 190899198332 |
children | cefad50507d8 78bbf4d43a14 |
comparison
equal
deleted
inserted
replaced
12872:98692a2d36d7 | 12873:4e7f99b70d9d |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1998, 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. |
626 _active = true; | 626 _active = true; |
627 } | 627 } |
628 | 628 |
629 | 629 |
630 // Returns value of location as an int | 630 // Returns value of location as an int |
631 intptr_t value_of_loc(oop *pointer) { return (intptr_t)(*pointer); } | 631 intptr_t value_of_loc(oop *pointer) { return cast_from_oop<intptr_t>((*pointer)); } |
632 | 632 |
633 | 633 |
634 void DerivedPointerTable::add(oop *derived_loc, oop *base_loc) { | 634 void DerivedPointerTable::add(oop *derived_loc, oop *base_loc) { |
635 assert(Universe::heap()->is_in_or_null(*base_loc), "not an oop"); | 635 assert(Universe::heap()->is_in_or_null(*base_loc), "not an oop"); |
636 assert(derived_loc != base_loc, "Base and derived in same location"); | 636 assert(derived_loc != base_loc, "Base and derived in same location"); |