Skip to content
Permalink
Browse files
8269095: Fix Valhalla Zero build failures
Reviewed-by: dsimms
  • Loading branch information
shipilev authored and David Simms committed Jun 23, 2021
1 parent b73a5c2 commit 936d430d38c8e5f596a8b00ecfc648ee7199fe04
Showing with 30 additions and 10 deletions.
  1. +1 −1 make/hotspot/lib/JvmFeatures.gmk
  2. +27 −7 src/hotspot/cpu/zero/sharedRuntime_zero.cpp
  3. +2 −2 src/hotspot/cpu/zero/vtableStubs_zero.cpp
@@ -48,7 +48,7 @@ ifeq ($(call check-jvm-feature, zero), true)
JVM_EXCLUDES += opto libadt
JVM_EXCLUDE_PATTERNS += c1_ c1/ c2_ runtime_ /c2/
JVM_EXCLUDE_FILES += templateInterpreter.cpp templateInterpreterGenerator.cpp \
bcEscapeAnalyzer.cpp ciTypeFlow.cpp
bcEscapeAnalyzer.cpp ciTypeFlow.cpp macroAssembler_common.cpp
JVM_CFLAGS_FEATURES += -DZERO -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
@@ -54,17 +54,37 @@ int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
return 0;
}

AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(
MacroAssembler *masm,
int total_args_passed,
int comp_args_on_stack,
const BasicType *sig_bt,
const VMRegPair *regs,
AdapterFingerPrint *fingerprint) {
int SharedRuntime::java_return_convention(const BasicType *sig_bt,
VMRegPair *regs,
int total_args_passed) {
Unimplemented();
return 0;
}

BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(const InlineKlass* vk) {
Unimplemented();
return NULL;
}

AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
int comp_args_on_stack,
const GrowableArray <SigEntry> *sig,
const VMRegPair *regs,
const GrowableArray <SigEntry> *sig_cc,
const VMRegPair *regs_cc,
const GrowableArray <SigEntry> *sig_cc_ro,
const VMRegPair *regs_cc_ro,
AdapterFingerPrint *fingerprint,
AdapterBlob *&new_adapter) {
new_adapter = AdapterBlob::create(masm->code(), 0, 0, NULL);
return AdapterHandlerLibrary::new_entry(
fingerprint,
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub));
}

@@ -27,12 +27,12 @@
#include "code/vtableStubs.hpp"
#include "utilities/debug.hpp"

VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
VtableStub* VtableStubs::create_vtable_stub(int vtable_index, bool caller_is_c1) {
ShouldNotCallThis();
return NULL;
}

VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
VtableStub* VtableStubs::create_itable_stub(int vtable_index, bool caller_is_c1) {
ShouldNotCallThis();
return NULL;
}

0 comments on commit 936d430

Please sign in to comment.