1.1 --- a/src/share/vm/oops/oop.inline2.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/oops/oop.inline2.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -27,25 +27,13 @@ 1.11 1.12 #include "gc_interface/collectedHeap.hpp" 1.13 #include "memory/generation.hpp" 1.14 -#include "memory/permGen.hpp" 1.15 #include "memory/universe.hpp" 1.16 #include "oops/oop.hpp" 1.17 1.18 // Implementation of all inlined member functions defined in oop.hpp 1.19 // We need a separate file to avoid circular references 1.20 1.21 -// Separate this out to break dependency. 1.22 -inline bool oopDesc::is_perm() const { 1.23 - return Universe::heap()->is_in_permanent(this); 1.24 -} 1.25 - 1.26 -// Check for NULL also. 1.27 -inline bool oopDesc::is_perm_or_null() const { 1.28 - return this == NULL || is_perm(); 1.29 -} 1.30 - 1.31 inline bool oopDesc::is_scavengable() const { 1.32 return Universe::heap()->is_scavengable(this); 1.33 } 1.34 - 1.35 #endif // SHARE_VM_OOPS_OOP_INLINE2_HPP