diff src/share/vm/ci/ciObject.hpp @ 3464:be4ca325525a

Merge.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 27 Jul 2011 17:32:44 -0700
parents 0654ee04b214 28a9fe9534ea
children 46f211fe010c
line wrap: on
line diff
--- a/src/share/vm/ci/ciObject.hpp	Wed Jul 27 17:24:11 2011 -0700
+++ b/src/share/vm/ci/ciObject.hpp	Wed Jul 27 17:32:44 2011 -0700
@@ -116,7 +116,7 @@
   int hash();
 
   // Tells if this oop has an encoding as a constant.
-  // True if is_scavengable is false.
+  // True if is_perm is true.
   // Also true if ScavengeRootsInCode is non-zero.
   // If it does not have an encoding, the compiler is responsible for
   // making other arrangements for dealing with the oop.
@@ -124,7 +124,7 @@
   bool can_be_constant();
 
   // Tells if this oop should be made a constant.
-  // True if is_scavengable is false or ScavengeRootsInCode > 1.
+  // True if is_perm is true or ScavengeRootsInCode > 1.
   bool should_be_constant();
 
   // Is this object guaranteed to be in the permanent part of the heap?