jdk-sandbox: comparison hotspot/src/share/vm/ci/ciObject.cpp

equal deleted inserted replaced

-:caf5eb7dd4a7
+:882756847a04
 /*
-* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 // GC and compilation can proceed independently without
 // interference.
 //
 // Within the VM, the oop and klass hierarchies are separate.
 // The compiler interface does not preserve this separation --
-// the distinction between `klassOop' and `Klass' are not
+// the distinction between `Klass*' and `Klass' are not
 // reflected in the interface and instead the Klass hierarchy
 // is directly modeled as the subclasses of ciKlass.
 // ------------------------------------------------------------------
 // ciObject::ciObject
 _handle = JNIHandles::make_local(o);
 } else {
 _handle = JNIHandles::make_global(o);
 }
 _klass = NULL;
-_ident = 0;
 init_flags_from(o);
 }
 // ------------------------------------------------------------------
 // ciObject::ciObject
 _handle = JNIHandles::make_local(h());
 } else {
 _handle = JNIHandles::make_global(h);
 }
 _klass = NULL;
-_ident = 0;
 init_flags_from(h());
 }
 // ------------------------------------------------------------------
 // ciObject::ciObject
 ciObject::ciObject(ciKlass* klass) {
 ASSERT_IN_VM;
 assert(klass != NULL, "must supply klass");
 _handle = NULL;
 _klass = klass;
-_ident = 0;
 }
 // ------------------------------------------------------------------
 // ciObject::ciObject
 //
 // NULL variant.  Used only by ciNullObject.
 ciObject::ciObject() {
 ASSERT_IN_VM;
 _handle = NULL;
 _klass = NULL;
-_ident = 0;
 }
 // ------------------------------------------------------------------
 // ciObject::klass
 //
 return NULL;
 }
 GUARDED_VM_ENTRY(
 oop o = get_oop();
-_klass = CURRENT_ENV->get_object(o->klass())->as_klass();
+_klass = CURRENT_ENV->get_klass(o->klass());
 );
 }
 return _klass;
-}
-// ------------------------------------------------------------------
-// ciObject::set_ident
-//
-// Set the unique identity number of a ciObject.
-void ciObject::set_ident(uint id) {
-assert((_ident >> FLAG_BITS) == 0, "must only initialize once");
-assert( id < ((uint)1 << (BitsPerInt-FLAG_BITS)), "id too big");
-_ident = _ident + (id << FLAG_BITS);
-}
-// ------------------------------------------------------------------
-// ciObject::ident
-//
-// Report the unique identity number of a ciObject.
-uint ciObject::ident() {
-uint id = _ident >> FLAG_BITS;
-assert(id != 0, "must be initialized");
-return id;
 }
 // ------------------------------------------------------------------
 // ciObject::equals
 //
 // ------------------------------------------------------------------
 // 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_perm();
+return handle() == NULL;
 }
 // ------------------------------------------------------------------
 // ciObject::should_be_constant()
 bool ciObject::should_be_constant() {
 if (ScavengeRootsInCode >= 2)  return true;  // force everybody to be a constant
 if (is_null_object()) return true;
 ciEnv* env = CURRENT_ENV;
-if (!JavaObjectsInPerm) {
 // We want Strings and Classes to be embeddable by default since
 // they used to be in the perm world.  Not all Strings used to be
 // embeddable but there's no easy way to distinguish the interned
 // from the regulars ones so just treat them all that way.
 if (klass() == env->String_klass() || klass() == env->Class_klass()) {
 return true;
 }
-}
 if (EnableInvokeDynamic &&
 (klass()->is_subclass_of(env->MethodHandle_klass()) ||
 klass()->is_subclass_of(env->CallSite_klass()))) {
 assert(ScavengeRootsInCode >= 1, "must be");
 // We want to treat these aggressively.
 return true;
 }
-return handle() == NULL || is_perm();
+return handle() == NULL;
 }
+// ------------------------------------------------------------------
+// ciObject::should_be_constant()
+void ciObject::init_flags_from(oop x) {
+int flags = 0;
+if (x != NULL) {
+assert(Universe::heap()->is_in_reserved(x), "must be");
+if (x->is_scavengable())
+flags |= SCAVENGABLE_FLAG;
+}
+_ident |= flags;
+}
 // ------------------------------------------------------------------
 // ciObject::print
 //
 // Print debugging output about this ciObject.
 // Implementation note: dispatch to the virtual print_impl behavior
 // for this ciObject.
 void ciObject::print(outputStream* st) {
 st->print("<%s", type_string());
 GUARDED_VM_ENTRY(print_impl(st);)
-st->print(" ident=%d %s%s address=0x%x>", ident(),
+st->print(" ident=%d %s address=0x%x>", ident(),
-is_perm() ? "PERM" : "",
 is_scavengable() ? "SCAVENGABLE" : "",
 (address)this);
 }
 // ------------------------------------------------------------------

changeset 13728	882756847a04
parent 10514	e229a19078cf
child 24322	c2978d1578e3