graal-jvmci-8: src/share/vm/oops/constantPoolOop.hpp comparison

Merge

comparison

equal deleted inserted replaced

-:a5a6adfca6ec
+:9b9c1ee9b3f6
 // marking thread before the tag was updated, redirty the card.
 oop_store_without_check((volatile oop *)obj_at_addr(which), str);
 }
 }
+void object_at_put(int which, oop str) {
+oop_store((volatile oop*) obj_at_addr(which), str);
+release_tag_at_put(which, JVM_CONSTANT_Object);
+if (UseConcMarkSweepGC) {
+// In case the earlier card-mark was consumed by a concurrent
+// marking thread before the tag was updated, redirty the card.
+oop_store_without_check((volatile oop*) obj_at_addr(which), str);
+}
+}
 // For temporary use while constructing constant pool
 void string_index_at_put(int which, int string_index) {
 tag_at_put(which, JVM_CONSTANT_StringIndex);
 *int_at_addr(which) = string_index;
 }
 constantTag tag = tag_at(which);
 return tag.is_klass() ||
 tag.is_unresolved_klass() ||
 tag.is_symbol() ||
 tag.is_unresolved_string() ||
-tag.is_string();
+tag.is_string() ||
+tag.is_object();
 }
 // Fetching constants
 klassOop klass_at(int which, TRAPS) {
 }
 oop string_at(int which, TRAPS) {
 constantPoolHandle h_this(THREAD, this);
 return string_at_impl(h_this, which, CHECK_NULL);
+}
+oop object_at(int which) {
+assert(tag_at(which).is_object(), "Corrupted constant pool");
+return *obj_at_addr(which);
 }
 // A "pseudo-string" is an non-string oop that has found is way into
 // a String entry.
 // Under AnonymousClasses this can happen if the user patches a live

Mercurial > hg > graal-jvmci-8