diff src/share/vm/ci/ciObjectFactory.cpp @ 1000:a1423fe86a18

Merge
author trims
date Fri, 09 Oct 2009 15:18:52 -0700
parents 89e0543e1737 148e5441d916
children 7c57aead6d3e
line wrap: on
line diff
--- a/src/share/vm/ci/ciObjectFactory.cpp	Fri Oct 02 11:26:25 2009 -0700
+++ b/src/share/vm/ci/ciObjectFactory.cpp	Fri Oct 09 15:18:52 2009 -0700
@@ -261,12 +261,11 @@
     ciObject* new_object = create_new_object(keyHandle());
     assert(keyHandle() == new_object->get_oop(), "must be properly recorded");
     init_ident_of(new_object);
-    if (!keyHandle->is_perm()) {
+    if (!new_object->is_perm()) {
       // Not a perm-space object.
       insert_non_perm(bucket, keyHandle(), new_object);
       return new_object;
     }
-    new_object->set_perm();
     if (len != _ci_objects->length()) {
       // creating the new object has recursively entered new objects
       // into the table.  We need to recompute our index.