Skip to content

8347987: Bad ifdef in 8330851 #23172

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 1 commit into from
Closed

8347987: Bad ifdef in 8330851 #23172

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
6 changes: 3 additions & 3 deletions src/hotspot/share/opto/runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ const TypeFunc* OptoRuntime::_updateBytesCRC32C_Type = nullptr;
const TypeFunc* OptoRuntime::_updateBytesAdler32_Type = nullptr;
const TypeFunc* OptoRuntime::_osr_end_Type = nullptr;
const TypeFunc* OptoRuntime::_register_finalizer_Type = nullptr;
#ifdef INCLUDE_JFR
#if INCLUDE_JFR
const TypeFunc* OptoRuntime::_class_id_load_barrier_Type = nullptr;
#endif // INCLUDE_JFR
#ifdef INCLUDE_JVMTI
#if INCLUDE_JVMTI
const TypeFunc* OptoRuntime::_notify_jvmti_vthread_Type = nullptr;
#endif // INCLUDE_JVMTI
const TypeFunc* OptoRuntime::_dtrace_method_entry_exit_Type = nullptr;
Expand Down Expand Up @@ -2002,7 +2002,7 @@ void OptoRuntime::initialize_types() {
JFR_ONLY(
_class_id_load_barrier_Type = make_class_id_load_barrier_Type();
)
#ifdef INCLUDE_JVMTI
#if INCLUDE_JVMTI
_notify_jvmti_vthread_Type = make_notify_jvmti_vthread_Type();
#endif // INCLUDE_JVMTI
_dtrace_method_entry_exit_Type = make_dtrace_method_entry_exit_Type();
Expand Down
6 changes: 3 additions & 3 deletions src/hotspot/share/opto/runtime.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ class OptoRuntime : public AllStatic {
static const TypeFunc* _updateBytesAdler32_Type;
static const TypeFunc* _osr_end_Type;
static const TypeFunc* _register_finalizer_Type;
#ifdef INCLUDE_JFR
#if INCLUDE_JFR
static const TypeFunc* _class_id_load_barrier_Type;
#endif // INCLUDE_JFR
#ifdef INCLUDE_JVMTI
#if INCLUDE_JVMTI
static const TypeFunc* _notify_jvmti_vthread_Type;
#endif // INCLUDE_JVMTI
static const TypeFunc* _dtrace_method_entry_exit_Type;
Expand Down Expand Up @@ -645,7 +645,7 @@ class OptoRuntime : public AllStatic {
return _register_finalizer_Type;
}

#ifdef INCLUDE_JFR
#if INCLUDE_JFR
static inline const TypeFunc* class_id_load_barrier_Type() {
assert(_class_id_load_barrier_Type != nullptr, "should be initialized");
return _class_id_load_barrier_Type;
Expand Down