infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-01 22:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

8348040: Bad use of ifdef with INCLUDE_xxx GC macros

Browse Source 
Reviewed-by: stefank, shade
This commit is contained in:
David Holmes 2025-01-20 20:31:26 +00:00
parent ca863fd5ab
commit 955bf185c3
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/c1/c1_LIR.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1016,7 +1016,7 @@ enum LIR_Code {
, begin_opAssert
, lir_assert
, end_opAssert
#ifdef INCLUDE_ZGC
#if INCLUDE_ZGC
, begin_opXLoadBarrierTest
, lir_xloadbarrier_test
, end_opXLoadBarrierTest

7
src/hotspot/share/runtime/mutexLocker.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -52,7 +52,7 @@ Mutex* JvmtiThreadState_lock = nullptr;
Monitor* EscapeBarrier_lock = nullptr;
Monitor* JvmtiVTMSTransition_lock = nullptr;
Monitor* Heap_lock = nullptr;
#ifdef INCLUDE_PARALLELGC
#if INCLUDE_PARALLELGC
Mutex* PSOldGenExpand_lock = nullptr;
#endif
Mutex* AdapterHandlerLibrary_lock = nullptr;
@ -333,7 +333,7 @@ void mutex_init() {
}
MUTEX_DEFL(CompileTaskAlloc_lock , PaddedMutex , MethodCompileQueue_lock);
#ifdef INCLUDE_PARALLELGC
#if INCLUDE_PARALLELGC
if (UseParallelGC) {
MUTEX_DEFL(PSOldGenExpand_lock , PaddedMutex , Heap_lock, true);
}
@ -377,4 +377,3 @@ GCMutexLocker::GCMutexLocker(Mutex* mutex) {
_mutex->lock();
}
}

4
src/hotspot/share/runtime/mutexLocker.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -49,7 +49,7 @@ extern Mutex* JvmtiThreadState_lock; // a lock on modification of JV
extern Monitor* EscapeBarrier_lock; // a lock to sync reallocating and relocking objects because of JVMTI access
extern Monitor* JvmtiVTMSTransition_lock; // a lock for Virtual Thread Mount State transition (VTMS transition) management
extern Monitor* Heap_lock; // a lock on the heap
#ifdef INCLUDE_PARALLELGC
#if INCLUDE_PARALLELGC
extern Mutex* PSOldGenExpand_lock; // a lock on expanding the heap
#endif
extern Mutex* AdapterHandlerLibrary_lock; // a lock on the AdapterHandlerLibrary