From 4c7c009dd6aa2ce1f65f05c05d7376240f3c01cd Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi Date: Thu, 18 Sep 2025 09:09:27 +0000 Subject: [PATCH] 8367740: assembler_.inline.hpp should not include assembler.inline.hpp Reviewed-by: dfenacci, ayang --- src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp | 2 +- src/hotspot/cpu/ppc/assembler_ppc.inline.hpp | 2 +- src/hotspot/cpu/riscv/assembler_riscv.inline.hpp | 2 +- src/hotspot/cpu/s390/assembler_s390.inline.hpp | 2 +- src/hotspot/cpu/zero/assembler_zero.inline.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp index e7efe472b82..fb14d588f04 100644 --- a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp +++ b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp @@ -26,7 +26,7 @@ #ifndef CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP #define CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP -#include "asm/assembler.inline.hpp" +#include "asm/assembler.hpp" #include "asm/codeBuffer.hpp" #include "code/codeCache.hpp" diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp index 24601c5d3b0..7e49ec7455d 100644 --- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp +++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp @@ -26,7 +26,7 @@ #ifndef CPU_PPC_ASSEMBLER_PPC_INLINE_HPP #define CPU_PPC_ASSEMBLER_PPC_INLINE_HPP -#include "asm/assembler.inline.hpp" +#include "asm/assembler.hpp" #include "asm/codeBuffer.hpp" #include "code/codeCache.hpp" #include "runtime/vm_version.hpp" diff --git a/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp b/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp index 1f9e6df2172..e85b64bd6ba 100644 --- a/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp +++ b/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp @@ -27,7 +27,7 @@ #ifndef CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP #define CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP -#include "asm/assembler.inline.hpp" +#include "asm/assembler.hpp" #include "asm/codeBuffer.hpp" #include "code/codeCache.hpp" diff --git a/src/hotspot/cpu/s390/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp index 567f3d75a62..3bab60f0bb6 100644 --- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp +++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp @@ -26,7 +26,7 @@ #ifndef CPU_S390_ASSEMBLER_S390_INLINE_HPP #define CPU_S390_ASSEMBLER_S390_INLINE_HPP -#include "asm/assembler.inline.hpp" +#include "asm/assembler.hpp" #include "asm/codeBuffer.hpp" #include "code/codeCache.hpp" diff --git a/src/hotspot/cpu/zero/assembler_zero.inline.hpp b/src/hotspot/cpu/zero/assembler_zero.inline.hpp index 0a3f4fc25fa..d78eb39c973 100644 --- a/src/hotspot/cpu/zero/assembler_zero.inline.hpp +++ b/src/hotspot/cpu/zero/assembler_zero.inline.hpp @@ -26,7 +26,7 @@ #ifndef CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP #define CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP -#include "asm/assembler.inline.hpp" +#include "asm/assembler.hpp" #include "asm/codeBuffer.hpp" #include "code/codeCache.hpp" #include "runtime/handles.inline.hpp"