comparison src/share/vm/oops/oop.inline2.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents da91efe96a93
children
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 /* 1 /*
2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2012, 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.
25 #ifndef SHARE_VM_OOPS_OOP_INLINE2_HPP 25 #ifndef SHARE_VM_OOPS_OOP_INLINE2_HPP
26 #define SHARE_VM_OOPS_OOP_INLINE2_HPP 26 #define SHARE_VM_OOPS_OOP_INLINE2_HPP
27 27
28 #include "gc_interface/collectedHeap.hpp" 28 #include "gc_interface/collectedHeap.hpp"
29 #include "memory/generation.hpp" 29 #include "memory/generation.hpp"
30 #include "memory/permGen.hpp"
31 #include "memory/universe.hpp" 30 #include "memory/universe.hpp"
32 #include "oops/oop.hpp" 31 #include "oops/oop.hpp"
33 32
34 // Implementation of all inlined member functions defined in oop.hpp 33 // Implementation of all inlined member functions defined in oop.hpp
35 // We need a separate file to avoid circular references 34 // We need a separate file to avoid circular references
36 35
37 // Separate this out to break dependency.
38 inline bool oopDesc::is_perm() const {
39 return Universe::heap()->is_in_permanent(this);
40 }
41
42 // Check for NULL also.
43 inline bool oopDesc::is_perm_or_null() const {
44 return this == NULL || is_perm();
45 }
46
47 inline bool oopDesc::is_scavengable() const { 36 inline bool oopDesc::is_scavengable() const {
48 return Universe::heap()->is_scavengable(this); 37 return Universe::heap()->is_scavengable(this);
49 } 38 }
50
51 #endif // SHARE_VM_OOPS_OOP_INLINE2_HPP 39 #endif // SHARE_VM_OOPS_OOP_INLINE2_HPP