Skip to content

8326509: Clean up JNIEXPORT in Hotspot after JDK-8017234 #17967

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

Closed
wants to merge 13 commits into from
Closed

8326509: Clean up JNIEXPORT in Hotspot after JDK-8017234 #17967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
04857e8
8017234: Hotspot should stop using mapfiles
magicus Feb 21, 2024
4f1668a
Remove unused symbol _Copy_conjoint_bytes on linux/arm32
magicus Feb 22, 2024
27b4df5
Rename the Windows export file to .def
magicus Feb 22, 2024
26b1e19
Restore linker script to linux/gcc builds
magicus Feb 22, 2024
ad1d53c
Rename the version script to version-script.txt
magicus Feb 22, 2024
00e40a7
Use #pragma instead of HIDDEN define
magicus Feb 22, 2024
7be8372
Revert "Use #pragma instead of HIDDEN define"
magicus Feb 23, 2024
efec671
8326509: Clean up JNIEXPORT in Hotspot after JDK-8017234
magicus Feb 22, 2024
b6bd5f2
Remove jvmci globals
magicus Feb 23, 2024
43c3513
Merge branch 'master' into hotspot-symbols-followup
magicus Feb 27, 2024
cc1c150
Remove das1()
magicus Feb 27, 2024
77409de
Remove #undef JNIEXPORT
magicus Feb 27, 2024
387d243
Why did these creep back in? Merge error?
magicus Feb 27, 2024
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
9 changes: 0 additions & 9 deletions src/hotspot/cpu/aarch64/assembler_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
#include "memory/resourceArea.hpp"
#include "metaprogramming/primitiveConversions.hpp"

#if defined(TARGET_COMPILER_gcc)
#undef JNIEXPORT
#define JNIEXPORT
#endif

#ifndef PRODUCT
const uintptr_t Assembler::asm_bp = 0x0000ffffac221240;
#endif
Expand Down Expand Up @@ -123,10 +118,6 @@ extern "C" {
else
Disassembler::decode((address)start, (address)start + len);
}

JNIEXPORT void das1(uintptr_t insn) {
das(insn, 1);
}
}

#define __ as->
Expand Down
11 changes: 3 additions & 8 deletions src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@
#include "jfr/jfr.hpp"
#endif

#if defined(TARGET_COMPILER_gcc)
#undef JNIEXPORT
#define JNIEXPORT
#endif

JVMCIKlassHandle::JVMCIKlassHandle(Thread* thread, Klass* klass) {
_thread = thread;
_klass = klass;
Expand Down Expand Up @@ -187,7 +182,7 @@ Handle JavaArgumentUnboxer::next_arg(BasicType expectedType) {
// Entry to native method implementation that transitions
// current thread to '_thread_in_vm'.
#define C2V_VMENTRY(result_type, name, signature) \
JNIEXPORT result_type JNICALL c2v_ ## name signature { \
result_type JNICALL c2v_ ## name signature { \
JavaThread* thread = JavaThread::current_or_null(); \
if (thread == nullptr) { \
env->ThrowNew(JNIJVMCI::InternalError::clazz(), \
Expand All @@ -198,7 +193,7 @@ Handle JavaArgumentUnboxer::next_arg(BasicType expectedType) {
JVMCITraceMark jtm("CompilerToVM::" #name);

#define C2V_VMENTRY_(result_type, name, signature, result) \
JNIEXPORT result_type JNICALL c2v_ ## name signature { \
result_type JNICALL c2v_ ## name signature { \
JavaThread* thread = JavaThread::current_or_null(); \
if (thread == nullptr) { \
env->ThrowNew(JNIJVMCI::InternalError::clazz(), \
Expand All @@ -214,7 +209,7 @@ Handle JavaArgumentUnboxer::next_arg(BasicType expectedType) {
// Entry to native method implementation that does not transition
// current thread to '_thread_in_vm'.
#define C2V_VMENTRY_PREFIX(result_type, name, signature) \
JNIEXPORT result_type JNICALL c2v_ ## name signature { \
result_type JNICALL c2v_ ## name signature { \
JavaThread* thread = JavaThread::current_or_null();

#define C2V_END }
Expand Down
13 changes: 0 additions & 13 deletions src/hotspot/share/jvmci/vmStructs_jvmci.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
#include "gc/g1/g1ThreadLocalData.hpp"
#endif

#if defined(TARGET_COMPILER_gcc)
#undef JNIEXPORT
#define JNIEXPORT
#endif

#define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
static_field(CompilerToVM::Data, Klass_vtable_start_offset, int) \
static_field(CompilerToVM::Data, Klass_vtable_length_offset, int) \
Expand Down Expand Up @@ -1028,14 +1023,6 @@ int JVMCIVMStructs::localHotSpotVMAddresses_count() {
return (sizeof(localHotSpotVMAddresses) / sizeof(VMAddressEntry)) - 1;
}

extern "C" {
JNIEXPORT VMStructEntry* jvmciHotSpotVMStructs = JVMCIVMStructs::localHotSpotVMStructs;
JNIEXPORT VMTypeEntry* jvmciHotSpotVMTypes = JVMCIVMStructs::localHotSpotVMTypes;
JNIEXPORT VMIntConstantEntry* jvmciHotSpotVMIntConstants = JVMCIVMStructs::localHotSpotVMIntConstants;
JNIEXPORT VMLongConstantEntry* jvmciHotSpotVMLongConstants = JVMCIVMStructs::localHotSpotVMLongConstants;
JNIEXPORT VMAddressEntry* jvmciHotSpotVMAddresses = JVMCIVMStructs::localHotSpotVMAddresses;
}

#ifdef ASSERT
// This is used both to check the types of referenced fields and
// to ensure that all of the field types are present.
Expand Down
5 changes: 0 additions & 5 deletions src/hotspot/share/utilities/debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
#include <stdio.h>
#include <stdarg.h>

#if defined(TARGET_COMPILER_gcc)
#undef JNIEXPORT
#define JNIEXPORT
#endif

// Support for showing register content on asserts/guarantees.
#ifdef CAN_SHOW_REGISTERS_ON_ASSERT
static char g_dummy;
Expand Down