diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp index 671791507f4..6cd7b97775d 100644 --- a/src/hotspot/share/c1/c1_LIR.hpp +++ b/src/hotspot/share/c1/c1_LIR.hpp @@ -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 diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp index ab809908581..d217fd0c6f1 100644 --- a/src/hotspot/share/runtime/mutexLocker.cpp +++ b/src/hotspot/share/runtime/mutexLocker.cpp @@ -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(); } } - diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp index b5098a6d726..598612df8f1 100644 --- a/src/hotspot/share/runtime/mutexLocker.hpp +++ b/src/hotspot/share/runtime/mutexLocker.hpp @@ -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