Skip to content

Commit 5704b56

Browse files
MichaelHaas99MichaelHaas99
committed
Rebase corrections.
1 parent 4e29d89 commit 5704b56

File tree

7 files changed

+41
-47
lines changed

7 files changed

+41
-47
lines changed

‎src/hotspot/share/jvmci/jvmciCodeInstaller.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ bool has_scalarized_return(methodHandle& methodHandle){
11671167
return false;
11681168
}
11691169
Method* method = methodHandle();
1170-
InlineKlass* klass = method->returns_inline_type(Thread::current());
1170+
InlineKlass* klass = method->returns_inline_type();
11711171
if (klass != nullptr) {
11721172
return !method->is_native() && klass->can_be_returned_as_fields();
11731173
}

‎src/hotspot/share/jvmci/jvmciCompilerToVM.cpp‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ C2V_VMENTRY_NULL(jobject, getResolvedJavaType0, (JNIEnv* env, jobject, jobject b
560560
intptr_t temp = (intptr_t) *((Klass**) (intptr_t) (base_address + offset));
561561

562562
// profiled type: cell without bit 0 and 1
563-
klass = (Klass*) (temp & TypeEntries::type_klass_mask);
563+
Klass* k = (Klass*) (temp & TypeEntries::type_klass_mask);
564564
if (k == nullptr || k->class_loader_data() == nullptr || !TrainingData::is_klass_loaded(k)) {
565565
return nullptr;
566566
}
@@ -734,38 +734,38 @@ C2V_VMENTRY_NULL(jobject, getArrayType, (JNIEnv* env, jobject, jchar type_char,
734734
return JVMCIENV->get_jobject(result);
735735
C2V_END
736736

737-
C2V_VMENTRY_NULL(jobject, getFlatArrayType, (JNIEnv* env, jobject, jchar type_char, ARGUMENT_PAIR(klass)))
738-
JVMCIKlassHandle array_klass(THREAD);
739-
Klass* klass = UNPACK_PAIR(Klass, klass);
740-
741-
if(klass->is_inline_klass()){
742-
InlineKlass* inline_klass = InlineKlass::cast(klass);
743-
ArrayKlass* flat_array_klass;
744-
if(inline_klass->flat_array()){
745-
flat_array_klass = (ArrayKlass*)inline_klass->flat_array_klass(LayoutKind::NON_ATOMIC_FLAT, CHECK_NULL);
746-
}else{
747-
flat_array_klass = (ArrayKlass*)inline_klass->null_free_reference_array(CHECK_NULL);
748-
}
749-
// Request a flat array, but we might not actually get it...either way "null-free" are the aaload/aastore semantics
750-
//ArrayKlass* flat_array_klass = (ArrayKlass*)inline_klass->flat_array_klass(LayoutKind::NON_ATOMIC_FLAT, CHECK_NULL);
751-
array_klass = flat_array_klass;
752-
assert(array_klass->is_null_free_array_klass(), "Expect a null-free array class here");
753-
//assert(array_klass->is_flatArray_klass, "Expect a flat array class here");
754-
}else{
755-
array_klass = klass->array_klass(CHECK_NULL);
756-
}
757-
JVMCIObject result = JVMCIENV->get_jvmci_type(array_klass, JVMCI_CHECK_NULL);
758-
return JVMCIENV->get_jobject(result);
759-
C2V_END
760-
761-
C2V_VMENTRY_NULL(jobject, getDefaultInlineTypeInstance, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass)))
762-
JVMCIKlassHandle array_klass(THREAD);
763-
Klass* klass = UNPACK_PAIR(Klass, klass);
764-
765-
assert(klass->is_inline_klass(), "Should only be called for inline types");
766-
oop default_value = InlineKlass::cast(klass)->default_value();
767-
return JVMCIENV->get_jobject(JVMCIENV->get_object_constant(default_value));
768-
C2V_END
737+
// C2V_VMENTRY_NULL(jobject, getFlatArrayType, (JNIEnv* env, jobject, jchar type_char, ARGUMENT_PAIR(klass)))
738+
// JVMCIKlassHandle array_klass(THREAD);
739+
// Klass* klass = UNPACK_PAIR(Klass, klass);
740+
741+
// if(klass->is_inline_klass()){
742+
// InlineKlass* inline_klass = InlineKlass::cast(klass);
743+
// ArrayKlass* flat_array_klass;
744+
// if(inline_klass->flat_array()){
745+
// flat_array_klass = (ArrayKlass*)inline_klass->flat_array_klass(LayoutKind::NON_ATOMIC_FLAT, CHECK_NULL);
746+
// }else{
747+
// flat_array_klass = (ArrayKlass*)inline_klass->null_free_reference_array(CHECK_NULL);
748+
// }
749+
// // Request a flat array, but we might not actually get it...either way "null-free" are the aaload/aastore semantics
750+
// //ArrayKlass* flat_array_klass = (ArrayKlass*)inline_klass->flat_array_klass(LayoutKind::NON_ATOMIC_FLAT, CHECK_NULL);
751+
// array_klass = flat_array_klass;
752+
// assert(array_klass->is_null_free_array_klass(), "Expect a null-free array class here");
753+
// //assert(array_klass->is_flatArray_klass, "Expect a flat array class here");
754+
// }else{
755+
// array_klass = klass->array_klass(CHECK_NULL);
756+
// }
757+
// JVMCIObject result = JVMCIENV->get_jvmci_type(array_klass, JVMCI_CHECK_NULL);
758+
// return JVMCIENV->get_jobject(result);
759+
// C2V_END
760+
761+
// C2V_VMENTRY_NULL(jobject, getDefaultInlineTypeInstance, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass)))
762+
// JVMCIKlassHandle array_klass(THREAD);
763+
// Klass* klass = UNPACK_PAIR(Klass, klass);
764+
765+
// assert(klass->is_inline_klass(), "Should only be called for inline types");
766+
// oop default_value = InlineKlass::cast(klass)->default_value();
767+
// return JVMCIENV->get_jobject(JVMCIENV->get_object_constant(default_value));
768+
// C2V_END
769769

770770
C2V_VMENTRY_NULL(jobject, lookupClass, (JNIEnv* env, jobject, jclass mirror))
771771
requireInHotSpot("lookupClass", JVMCI_CHECK_NULL);
@@ -3440,8 +3440,8 @@ JNINativeMethod CompilerToVM::methods[] = {
34403440
{CC "lookupJClass", CC "(J)" HS_RESOLVED_TYPE, FN_PTR(lookupJClass)},
34413441
{CC "getJObjectValue", CC "(" OBJECTCONSTANT ")J", FN_PTR(getJObjectValue)},
34423442
{CC "getArrayType", CC "(C" HS_KLASS2 ")" HS_KLASS, FN_PTR(getArrayType)},
3443-
{CC "getFlatArrayType", CC "(C" HS_KLASS2 ")" HS_KLASS, FN_PTR(getFlatArrayType)},
3444-
{CC "getDefaultInlineTypeInstance", CC "(" HS_KLASS2 ")" JAVACONSTANT, FN_PTR(getDefaultInlineTypeInstance)},
3443+
// {CC "getFlatArrayType", CC "(C" HS_KLASS2 ")" HS_KLASS, FN_PTR(getFlatArrayType)},
3444+
// {CC "getDefaultInlineTypeInstance", CC "(" HS_KLASS2 ")" JAVACONSTANT, FN_PTR(getDefaultInlineTypeInstance)},
34453445
{CC "lookupClass", CC "(" CLASS ")" HS_RESOLVED_TYPE, FN_PTR(lookupClass)},
34463446
{CC "lookupNameInPool", CC "(" HS_CONSTANT_POOL2 "II)" STRING, FN_PTR(lookupNameInPool)},
34473447
{CC "lookupNameAndTypeRefIndexInPool", CC "(" HS_CONSTANT_POOL2 "II)I", FN_PTR(lookupNameAndTypeRefIndexInPool)},

‎src/hotspot/share/jvmci/jvmciRuntime.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -417,16 +417,12 @@ JRT_LEAF(jboolean, JVMCIRuntime::object_notify(JavaThread* current, oopDesc* obj
417417
JRT_END
418418

419419
JRT_ENTRY(void, JVMCIRuntime::load_unknown_inline(JavaThread* current, flatArrayOopDesc* array, jint index))
420-
assert(array->klass()->is_flatArray_klass(), "should not be called");
421-
422-
assert(array->length() > 0 && index < array->length(), "already checked");
423-
oop obj = array->read_value_from_flat_array(index, THREAD);
424-
current->set_vm_result(obj);
420+
oop buffer = array->obj_at(index, THREAD);
421+
current->set_vm_result_oop(buffer);
425422
JRT_END
426423

427424
JRT_ENTRY(void, JVMCIRuntime::store_unknown_inline(JavaThread* current, flatArrayOopDesc* array, jint index, oopDesc* value))
428-
assert(array->klass()->is_flatArray_klass(), "should not be called");
429-
array->write_value_to_flat_array(value, index, THREAD);
425+
array->obj_at_put(index, value, THREAD);
430426
JRT_END
431427

432428
// Object.notifyAll() fast path, caller does slow path

‎src/hotspot/share/jvmci/vmStructs_jvmci.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,6 @@
840840
declare_constant(Klass::_lh_array_tag_shift) \
841841
declare_constant(Klass::_lh_array_tag_type_value) \
842842
declare_constant(Klass::_lh_array_tag_ref_value) \
843-
declare_constant(Klass::_lh_array_tag_obj_value) \
844843
declare_constant(Klass::_lh_null_free_shift) \
845844
declare_constant(Klass::_lh_null_free_mask) \
846845
\

‎src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public int hashCode() {
5555
*/
5656
protected abstract HotSpotResolvedObjectType getArrayType();
5757

58-
abstract HotSpotResolvedObjectTypeImpl getFlatArrayType();
58+
abstract HotSpotResolvedObjectType getFlatArrayType();
5959

6060
@Override
6161
public HotSpotResolvedObjectType getArrayClass() {

‎src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,6 @@ private HotSpotResolvedJavaField[] getFlattenedFields(HotSpotResolvedJavaField[]
953953
}
954954
}
955955
assert resultList.size() == resultCount : "wrong flat field count";
956-
resultList.sort(fieldSortingMethod);
957956
return resultList.toArray(new HotSpotResolvedJavaField[resultList.size()]);
958957
}
959958

‎src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected HotSpotResolvedObjectType getArrayType() {
9898
}
9999

100100
@Override
101-
HotSpotResolvedObjectTypeImpl getFlatArrayType() {
101+
HotSpotResolvedObjectType getFlatArrayType() {
102102
return getArrayType();
103103
}
104104

0 commit comments

Comments
 (0)