Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8258480: [lworld] Adapter creation asserts with -XX:+VerifyAdapterSharing #304

Closed
wants to merge 1 commit into from
Closed

8258480: [lworld] Adapter creation asserts with -XX:+VerifyAdapterSharing #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 21 additions & 30 deletions src/hotspot/share/runtime/sharedRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,27 +2377,14 @@ class AdapterFingerPrint : public CHeapObj<mtCode> {
// Remap BasicTypes that are handled equivalently by the adapters.
// These are correct for the current system but someday it might be
// necessary to make this mapping platform dependent.
static int adapter_encoding(BasicType in, bool is_inlinetype) {
static BasicType adapter_encoding(BasicType in) {
switch (in) {
case T_BOOLEAN:
case T_BYTE:
case T_SHORT:
case T_CHAR: {
if (is_inlinetype) {
// Do not widen inline type field types
assert(InlineTypePassFieldsAsArgs, "must be enabled");
return in;
} else {
// They are all promoted to T_INT in the calling convention
return T_INT;
}
}

case T_INLINE_TYPE: {
// If inline types are passed as fields, return 'in' to differentiate
// between a T_INLINE_TYPE and a T_OBJECT in the signature.
return InlineTypePassFieldsAsArgs ? in : adapter_encoding(T_OBJECT, false);
}
case T_CHAR:
// They are all promoted to T_INT in the calling convention
return T_INT;

case T_OBJECT:
case T_ARRAY:
Expand Down Expand Up @@ -2444,33 +2431,37 @@ class AdapterFingerPrint : public CHeapObj<mtCode> {

// Now pack the BasicTypes with 8 per int
int sig_index = 0;
BasicType prev_sbt = T_ILLEGAL;
BasicType prev_bt = T_ILLEGAL;
int vt_count = 0;
for (int index = 0; index < len; index++) {
int value = 0;
for (int byte = 0; byte < _basic_types_per_int; byte++) {
int bt = 0;
BasicType bt = T_ILLEGAL;
if (sig_index < total_args_passed) {
BasicType sbt = sig->at(sig_index++)._bt;
if (InlineTypePassFieldsAsArgs && sbt == T_INLINE_TYPE) {
bt = sig->at(sig_index++)._bt;
if (bt == T_INLINE_TYPE) {
// Found start of inline type in signature
vt_count++;
assert(InlineTypePassFieldsAsArgs, "unexpected start of inline type");
if (sig_index == 1 && has_ro_adapter) {
// With a ro_adapter, replace receiver inline type delimiter by T_VOID to prevent matching
// with other adapters that have the same inline type as first argument and no receiver.
sbt = T_VOID;
bt = T_VOID;
}
} else if (InlineTypePassFieldsAsArgs && sbt == T_VOID &&
prev_sbt != T_LONG && prev_sbt != T_DOUBLE) {
vt_count++;
} else if (bt == T_VOID && prev_bt != T_LONG && prev_bt != T_DOUBLE) {
// Found end of inline type in signature
assert(InlineTypePassFieldsAsArgs, "unexpected end of inline type");
vt_count--;
assert(vt_count >= 0, "invalid vt_count");
} else if (vt_count == 0) {
// Widen fields that are not part of a scalarized inline type argument
bt = adapter_encoding(bt);
}
bt = adapter_encoding(sbt, vt_count > 0);
prev_sbt = sbt;
prev_bt = bt;
}
assert((bt & _basic_type_mask) == bt, "must fit in 4 bits");
value = (value << _basic_type_bits) | bt;
int bt_val = (bt == T_ILLEGAL) ? 0 : bt;
assert((bt_val & _basic_type_mask) == bt_val, "must fit in 4 bits");
value = (value << _basic_type_bits) | bt_val;
}
ptr[index] = value;
}
Expand Down Expand Up @@ -2868,7 +2859,7 @@ void CompiledEntrySignature::compute_calling_conventions() {
_sig_cc_ro = _sig_cc;
_regs_cc_ro = _regs_cc;
_args_on_stack_cc_ro = _args_on_stack_cc;
if (_has_inline_recv || _args_on_stack_cc > _args_on_stack) {
if (_has_inline_recv) {
// For interface calls, we need another entry point / adapter to unpack the receiver
_args_on_stack_cc_ro = compute_scalarized_cc(_sig_cc_ro, _regs_cc_ro, /* scalar_receiver = */ false);
}
Expand Down
8 changes: 4 additions & 4 deletions src/hotspot/share/runtime/sharedRuntime.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,13 +708,13 @@ class AdapterHandlerEntry : public BasicHashtableEntry<mtCode> {
AdapterHandlerEntry();

public:
address get_i2c_entry() const { return _i2c_entry; }
address get_c2i_entry() const { return _c2i_entry; }
address get_i2c_entry() const { return _i2c_entry; }
address get_c2i_entry() const { return _c2i_entry; }
address get_c2i_inline_entry() const { return _c2i_inline_entry; }
address get_c2i_inline_ro_entry() const { return _c2i_inline_ro_entry; }
address get_c2i_unverified_entry() const { return _c2i_unverified_entry; }
address get_c2i_unverified_entry() const { return _c2i_unverified_entry; }
address get_c2i_unverified_inline_entry() const { return _c2i_unverified_inline_entry; }
address get_c2i_no_clinit_check_entry() const { return _c2i_no_clinit_check_entry; }
address get_c2i_no_clinit_check_entry() const { return _c2i_no_clinit_check_entry; }

address base_address();
void relocate(address new_base);
Expand Down
7 changes: 4 additions & 3 deletions test/hotspot/jtreg/compiler/valhalla/inlinetypes/InlineTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ public abstract class InlineTypeTest {
private static final String[] printFlags = {
"-XX:+PrintCompilation", "-XX:+PrintIdeal", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintOptoAssembly"};
private static final String[] verifyFlags = {
"-XX:+VerifyOops", "-XX:+VerifyStack", "-XX:+VerifyLastFrame", "-XX:+VerifyBeforeGC", "-XX:+VerifyAfterGC",
"-XX:+VerifyDuringGC", "-XX:+VerifyAdapterSharing"};
"-XX:+UnlockDiagnosticVMOptions", "-XX:+VerifyOops", "-XX:+VerifyStack", "-XX:+VerifyLastFrame",
"-XX:+VerifyBeforeGC", "-XX:+VerifyAfterGC", "-XX:+VerifyDuringGC", "-XX:+VerifyAdapterSharing"};

protected static final int InlineTypePassFieldsAsArgsOn = 0x1;
protected static final int InlineTypePassFieldsAsArgsOff = 0x2;
Expand Down Expand Up @@ -848,7 +848,8 @@ enum TriState {
}

static private TriState compiledByC2(Method m) {
if (!USE_COMPILER || XCOMP || TEST_C1) {
if (!USE_COMPILER || XCOMP || TEST_C1 ||
(STRESS_CC && !WHITE_BOX.isMethodCompilable(m, COMP_LEVEL_FULL_OPTIMIZATION, false))) {
return TriState.Maybe;
}
if (WHITE_BOX.isMethodCompiled(m, false) &&
Expand Down