From 3adb555fb0d7584a0537cbbb138edbd374cca2d6 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Fri, 10 Jan 2025 21:45:13 +0000 Subject: [PATCH] 8293123: Include of jvm.h breaks include block sort order --- src/hotspot/os/windows/include/jvm_md.h | 6 +++--- src/hotspot/share/include/jvm.h | 4 ++-- src/hotspot/share/jfr/jfr.hpp | 4 ++-- src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp | 4 ++-- src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp | 4 ++-- src/hotspot/share/jfr/writers/jfrWriterHost.hpp | 4 ++-- src/hotspot/share/runtime/thread.hpp | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/hotspot/os/windows/include/jvm_md.h b/src/hotspot/os/windows/include/jvm_md.h index a0e44a4561365..165b25a82f919 100644 --- a/src/hotspot/os/windows/include/jvm_md.h +++ b/src/hotspot/os/windows/include/jvm_md.h @@ -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 @@ -31,12 +31,12 @@ * JNI conversion, which should be sorted out later. */ +#include "jni.h" + #include #include #include -#include "jni.h" - typedef int socklen_t; #define JNI_LIB_PREFIX "" diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h index 474d5baa487bd..c2a1a3f53f6ca 100644 --- a/src/hotspot/share/include/jvm.h +++ b/src/hotspot/share/include/jvm.h @@ -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 @@ -29,9 +29,9 @@ #include #include "jni.h" -#include "jvm_md.h" #include "jvm_constants.h" #include "jvm_io.h" +#include "jvm_md.h" #ifdef __cplusplus extern "C" { diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp index 4b34784558ef3..df19ebc5808d0 100644 --- a/src/hotspot/share/jfr/jfr.hpp +++ b/src/hotspot/share/jfr/jfr.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 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 @@ -27,8 +27,8 @@ #include "jni.h" #include "memory/allStatic.hpp" -#include "utilities/exceptions.hpp" #include "oops/oopsHierarchy.hpp" +#include "utilities/exceptions.hpp" #include "utilities/globalDefinitions.hpp" class CallInfo; diff --git a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp index d9610bcc97005..9c98ac4780d54 100644 --- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp +++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 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 @@ -23,7 +23,6 @@ */ #include "precompiled.hpp" -#include "jni.h" #include "classfile/symbolTable.hpp" #include "classfile/systemDictionary.hpp" #include "classfile/vmSymbols.hpp" @@ -32,6 +31,7 @@ #include "jfr/support/jfrThreadLocal.hpp" #include "jfr/utilities/jfrTypes.hpp" #include "jfr/writers/jfrJavaEventWriter.hpp" +#include "jni.h" #include "memory/iterator.hpp" #include "oops/instanceKlass.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp index b93d6ad8cacc0..92a9a7a693e50 100644 --- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp +++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 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 @@ -25,8 +25,8 @@ #ifndef SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP #define SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP -#include "jni.h" #include "jfr/utilities/jfrTypes.hpp" +#include "jni.h" #include "memory/allStatic.hpp" #include "utilities/exceptions.hpp" diff --git a/src/hotspot/share/jfr/writers/jfrWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrWriterHost.hpp index 2d28e84fd298e..2d07c8239ceaf 100644 --- a/src/hotspot/share/jfr/writers/jfrWriterHost.hpp +++ b/src/hotspot/share/jfr/writers/jfrWriterHost.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 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 @@ -25,9 +25,9 @@ #ifndef SHARE_JFR_WRITERS_JFRWRITERHOST_HPP #define SHARE_JFR_WRITERS_JFRWRITERHOST_HPP +#include "jfr/utilities/jfrTime.hpp" #include "jni.h" #include "utilities/globalDefinitions.hpp" -#include "jfr/utilities/jfrTime.hpp" class ClassLoaderData; class Klass; diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp index 513294688c62c..d0c0e4d5f7373 100644 --- a/src/hotspot/share/runtime/thread.hpp +++ b/src/hotspot/share/runtime/thread.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. * Copyright (c) 2021, Azul Systems, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -26,9 +26,9 @@ #ifndef SHARE_RUNTIME_THREAD_HPP #define SHARE_RUNTIME_THREAD_HPP -#include "jni.h" #include "gc/shared/gcThreadLocalData.hpp" #include "gc/shared/threadLocalAllocBuffer.hpp" +#include "jni.h" #include "memory/allocation.hpp" #include "runtime/atomic.hpp" #include "runtime/globals.hpp"