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.

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

8269279: [lworld] 8269231 causes build failures #463

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -70,15 +70,19 @@ inline bool markWord::must_be_preserved_for_promotion_failure(const oopDesc* obj

inline markWord markWord::prototype_for_klass(const Klass* klass) {
markWord prototype_header = klass->prototype_header();
#ifdef _LP64
assert(prototype_header == prototype() ||
(UseBiasedLocking && prototype_header.has_bias_pattern())
|| prototype_header.is_inline_type()
#ifdef _LP64
|| prototype_header.is_flat_array()
|| prototype_header.is_null_free_array()
#endif
, "corrupt prototype header");

#else
assert(prototype_header == prototype() ||
(UseBiasedLocking && prototype_header.has_bias_pattern())
|| prototype_header.is_inline_type()
, "corrupt prototype header");
#endif
return prototype_header;
}

@@ -298,8 +298,8 @@ static void assert_and_log_unsafe_value_access(oop p, jlong offset, InlineKlass*
assert(fd.is_inlined(), "field not flat");
} else {
if (log_is_enabled(Trace, valuetypes)) {
log_trace(valuetypes)("not a field in %s at offset " JLONG_FORMAT_X,
p->klass()->external_name(), offset);
log_trace(valuetypes)("not a field in %s at offset " JULONG_FORMAT_X,
p->klass()->external_name(), (uint64_t)offset);
}
}
} else if (k->is_flatArray_klass()) {
@@ -316,12 +316,12 @@ static void assert_and_log_unsafe_value_access(oop p, jlong offset, InlineKlass*
FlatArrayKlass* vak = FlatArrayKlass::cast(k);
int index = (offset - vak->array_header_in_bytes()) / vak->element_byte_size();
address dest = (address)((flatArrayOop)p)->value_at_addr(index, vak->layout_helper());
log_trace(valuetypes)("%s array type %s index %d element size %d offset " JLONG_FORMAT_X " at " INTPTR_FORMAT,
log_trace(valuetypes)("%s array type %s index %d element size %d offset " JULONG_FORMAT_X " at " INTPTR_FORMAT,
p->klass()->external_name(), vak->external_name(),
index, vak->element_byte_size(), offset, p2i(dest));
index, vak->element_byte_size(), (uint64_t)offset, p2i(dest));
} else {
log_trace(valuetypes)("%s field type %s at offset " JLONG_FORMAT_X,
p->klass()->external_name(), vk->external_name(), offset);
log_trace(valuetypes)("%s field type %s at offset " JULONG_FORMAT_X,
p->klass()->external_name(), vk->external_name(), (uint64_t)offset);
}
}
}
@@ -104,7 +104,6 @@ class oopDesc;
// Format 64-bit quantities.
#define INT64_FORMAT "%" PRId64
#define UINT64_FORMAT "%" PRIu64
#define INT64_FORMAT_X "%" PRIx64
#define UINT64_FORMAT_X "%" PRIx64
#define INT64_FORMAT_W(width) "%" #width PRId64
#define UINT64_FORMAT_W(width) "%" #width PRIu64
@@ -119,9 +118,6 @@ class oopDesc;
#ifndef JLONG_FORMAT_W
#define JLONG_FORMAT_W(width) INT64_FORMAT_W(width)
#endif
#ifndef JLONG_FORMAT_X
#define JLONG_FORMAT_X INT64_FORMAT_X
#endif
#ifndef JULONG_FORMAT
#define JULONG_FORMAT UINT64_FORMAT
#endif