Mercurial > hg > release > icedtea7-forest-2.0 > hotspot
changeset 2572:28a9fe9534ea
7048030: is_scavengable changes causing compiler to embed more constants
Summary: ciObject::can_be_constant() and should_be_constant() should use is_perm() instead of !is_scavengable()
Reviewed-by: never, jrose
| author | kvn |
|---|---|
| date | Tue, 24 May 2011 20:24:11 -0700 |
| parents | ccf072cdba91 |
| children | 7db2b9499c36 |
| files | src/share/vm/ci/ciObject.cpp src/share/vm/ci/ciObject.hpp |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/ci/ciObject.cpp Tue May 24 15:30:05 2011 -0700 +++ b/src/share/vm/ci/ciObject.cpp Tue May 24 20:24:11 2011 -0700 @@ -187,7 +187,7 @@ // ciObject::can_be_constant bool ciObject::can_be_constant() { if (ScavengeRootsInCode >= 1) return true; // now everybody can encode as a constant - return handle() == NULL || !is_scavengable(); + return handle() == NULL || is_perm(); } // ------------------------------------------------------------------ @@ -204,7 +204,7 @@ return true; } } - return handle() == NULL || !is_scavengable(); + return handle() == NULL || is_perm(); }
--- a/src/share/vm/ci/ciObject.hpp Tue May 24 15:30:05 2011 -0700 +++ b/src/share/vm/ci/ciObject.hpp Tue May 24 20:24:11 2011 -0700 @@ -108,7 +108,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. @@ -116,7 +116,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?