diff 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
line wrap: on
line diff
--- a/src/share/vm/oops/oop.inline2.hpp	Mon Nov 12 18:11:17 2012 +0100
+++ b/src/share/vm/oops/oop.inline2.hpp	Mon Nov 12 23:14:12 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,25 +27,13 @@
 
 #include "gc_interface/collectedHeap.hpp"
 #include "memory/generation.hpp"
-#include "memory/permGen.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.hpp"
 
 // Implementation of all inlined member functions defined in oop.hpp
 // We need a separate file to avoid circular references
 
-// Separate this out to break dependency.
-inline bool oopDesc::is_perm() const {
-  return Universe::heap()->is_in_permanent(this);
-}
-
-// Check for NULL also.
-inline bool oopDesc::is_perm_or_null() const {
-  return this == NULL || is_perm();
-}
-
 inline bool oopDesc::is_scavengable() const {
   return Universe::heap()->is_scavengable(this);
 }
-
 #endif // SHARE_VM_OOPS_OOP_INLINE2_HPP