Skip to content

8017234: Hotspot should stop using mapfiles #17955

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 9 commits into from
Closed

8017234: Hotspot should stop using mapfiles #17955

Changes from 1 commit
Commits
Show all changes
9 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
6100950
Merge branch 'master' into hotspot-symbols-proper
magicus Feb 26, 2024
c58764a
Use --exclude-libs and -version-script on linux/clang too
magicus Feb 26, 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
51 changes: 27 additions & 24 deletions src/hotspot/share/oops/accessBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,14 @@
#include "utilities/debug.hpp"
#include "utilities/vmError.hpp"

#if defined(TARGET_COMPILER_gcc)
#define HIDDEN __attribute__ ((visibility ("hidden")))
#else
#define HIDDEN
#endif

namespace AccessInternal {
// These forward copying calls to Copy without exposing the Copy type in headers unnecessarily

#if defined(TARGET_COMPILER_gcc)
// Needed to work around bug in gcc causing these symbols to be visible despite -fvisibility=hidden
#pragma GCC visibility push(hidden)
#endif

void arraycopy_arrayof_conjoint_oops(void* src, void* dst, size_t length) {
Copy::arrayof_conjoint_oops(reinterpret_cast<HeapWord*>(src),
reinterpret_cast<HeapWord*>(dst), length);
Expand All @@ -64,106 +63,110 @@ namespace AccessInternal {
reinterpret_cast<HeapWord*>(dst), length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jboolean>(jboolean* src, jboolean* dst, size_t length) {
Copy::conjoint_jbytes(reinterpret_cast<jbyte*>(src), reinterpret_cast<jbyte*>(dst), length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jbyte>(jbyte* src, jbyte* dst, size_t length) {
Copy::conjoint_jbytes(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jchar>(jchar* src, jchar* dst, size_t length) {
Copy::conjoint_jshorts_atomic(reinterpret_cast<jshort*>(src), reinterpret_cast<jshort*>(dst), length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jshort>(jshort* src, jshort* dst, size_t length) {
Copy::conjoint_jshorts_atomic(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jint>(jint* src, jint* dst, size_t length) {
Copy::conjoint_jints_atomic(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jfloat>(jfloat* src, jfloat* dst, size_t length) {
Copy::conjoint_jints_atomic(reinterpret_cast<jint*>(src), reinterpret_cast<jint*>(dst), length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jlong>(jlong* src, jlong* dst, size_t length) {
Copy::conjoint_jlongs_atomic(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<jdouble>(jdouble* src, jdouble* dst, size_t length) {
Copy::conjoint_jlongs_atomic(reinterpret_cast<jlong*>(src), reinterpret_cast<jlong*>(dst), length);
}

template<> HIDDEN
template<>
void arraycopy_arrayof_conjoint<jbyte>(jbyte* src, jbyte* dst, size_t length) {
Copy::arrayof_conjoint_jbytes(reinterpret_cast<HeapWord*>(src),
reinterpret_cast<HeapWord*>(dst),
length);
}

template<> HIDDEN
template<>
void arraycopy_arrayof_conjoint<jshort>(jshort* src, jshort* dst, size_t length) {
Copy::arrayof_conjoint_jshorts(reinterpret_cast<HeapWord*>(src),
reinterpret_cast<HeapWord*>(dst),
length);
}

template<> HIDDEN
template<>
void arraycopy_arrayof_conjoint<jint>(jint* src, jint* dst, size_t length) {
Copy::arrayof_conjoint_jints(reinterpret_cast<HeapWord*>(src),
reinterpret_cast<HeapWord*>(dst),
length);
}

template<> HIDDEN
template<>
void arraycopy_arrayof_conjoint<jlong>(jlong* src, jlong* dst, size_t length) {
Copy::arrayof_conjoint_jlongs(reinterpret_cast<HeapWord*>(src),
reinterpret_cast<HeapWord*>(dst),
length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint<void>(void* src, void* dst, size_t length) {
Copy::conjoint_jbytes(reinterpret_cast<jbyte*>(src),
reinterpret_cast<jbyte*>(dst),
length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint_atomic<jbyte>(jbyte* src, jbyte* dst, size_t length) {
Copy::conjoint_jbytes_atomic(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint_atomic<jshort>(jshort* src, jshort* dst, size_t length) {
Copy::conjoint_jshorts_atomic(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint_atomic<jint>(jint* src, jint* dst, size_t length) {
Copy::conjoint_jints_atomic(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint_atomic<jlong>(jlong* src, jlong* dst, size_t length) {
Copy::conjoint_jlongs_atomic(src, dst, length);
}

template<> HIDDEN
template<>
void arraycopy_conjoint_atomic<void>(void* src, void* dst, size_t length) {
Copy::conjoint_memory_atomic(src, dst, length);
}

#if defined(TARGET_COMPILER_gcc)
#pragma GCC visibility pop
#endif

#ifdef ASSERT
void check_access_thread_state() {
if (VMError::is_error_reported() || DebuggingContext::is_enabled()) {
Expand Down