Mercurial > hg > graal-compiler
comparison src/share/vm/compiler/oopMap.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | 3ac7d10a6572 190899198332 |
children | ce5e6f9075b6 |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
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. |
629 _active = true; | 629 _active = true; |
630 } | 630 } |
631 | 631 |
632 | 632 |
633 // Returns value of location as an int | 633 // Returns value of location as an int |
634 intptr_t value_of_loc(oop *pointer) { return (intptr_t)(*pointer); } | 634 intptr_t value_of_loc(oop *pointer) { return cast_from_oop<intptr_t>((*pointer)); } |
635 | 635 |
636 | 636 |
637 void DerivedPointerTable::add(oop *derived_loc, oop *base_loc) { | 637 void DerivedPointerTable::add(oop *derived_loc, oop *base_loc) { |
638 assert(Universe::heap()->is_in_or_null(*base_loc), "not an oop"); | 638 assert(Universe::heap()->is_in_or_null(*base_loc), "not an oop"); |
639 assert(derived_loc != base_loc, "Base and derived in same location"); | 639 assert(derived_loc != base_loc, "Base and derived in same location"); |