--- a/hotspot/src/share/vm/ci/ciObject.cpp Tue May 24 15:30:05 2011 -0700
+++ b/hotspot/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();
}