From 1f4a7bbb9d67fdaaf63a70d92df895aea41ad201 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 4 Mar 2026 22:42:19 +0000
Subject: [PATCH] 8379040: Remove inclusion of allocation.hpp from
 atomicAccess.hpp

Reviewed-by: iwalulya, dholmes
---
 src/hotspot/share/opto/phasetype.hpp       | 3 ++-
 src/hotspot/share/runtime/atomicAccess.hpp | 6 +++---
 src/hotspot/share/utilities/bitMap.hpp     | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index f388dc6cdc6..ce432fbfc01 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, 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
@@ -25,6 +25,7 @@
 #ifndef SHARE_OPTO_PHASETYPE_HPP
 #define SHARE_OPTO_PHASETYPE_HPP
 
+#include "memory/allocation.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/stringUtils.hpp"
 
diff --git a/src/hotspot/share/runtime/atomicAccess.hpp b/src/hotspot/share/runtime/atomicAccess.hpp
index c9a2dfb9383..46330cffdb2 100644
--- a/src/hotspot/share/runtime/atomicAccess.hpp
+++ b/src/hotspot/share/runtime/atomicAccess.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, 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
@@ -26,7 +26,7 @@
 #define SHARE_RUNTIME_ATOMICACCESS_HPP
 
 #include "cppstdlib/type_traits.hpp"
-#include "memory/allocation.hpp"
+#include "memory/allStatic.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "metaprogramming/primitiveConversions.hpp"
 #include "runtime/orderAccess.hpp"
@@ -829,7 +829,7 @@ class AtomicAccess::PlatformBitops
 {};
 
 template <ScopedFenceType T>
-class ScopedFenceGeneral: public StackObj {
+class ScopedFenceGeneral {
  public:
   void prefix() {}
   void postfix() {}
diff --git a/src/hotspot/share/utilities/bitMap.hpp b/src/hotspot/share/utilities/bitMap.hpp
index 5ee462bbe47..17bf437ecae 100644
--- a/src/hotspot/share/utilities/bitMap.hpp
+++ b/src/hotspot/share/utilities/bitMap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, 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
@@ -30,6 +30,7 @@
 #include "utilities/globalDefinitions.hpp"
 
 // Forward decl;
+class Arena;
 class BitMapClosure;
 
 // Operations for bitmaps represented as arrays of unsigned integers.