Skip to content

Commit 2155afe

Browse files
tstuefetstuefe
committed
8280503: Use allStatic.hpp instead of allocation.hpp where possible
Reviewed-by: dholmes, iklam
1 parent 295b263 commit 2155afe

File tree

172 files changed

+368
-333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+368
-333
lines changed

‎src/hotspot/cpu/aarch64/bytes_aarch64.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -26,7 +26,7 @@
2626
#ifndef CPU_AARCH64_BYTES_AARCH64_HPP
2727
#define CPU_AARCH64_BYTES_AARCH64_HPP
2828

29-
#include "memory/allocation.hpp"
29+
#include "memory/allStatic.hpp"
3030

3131
class Bytes: AllStatic {
3232
public:

‎src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -27,7 +27,7 @@
2727
#define CPU_AARCH64_JNITYPES_AARCH64_HPP
2828

2929
#include "jni.h"
30-
#include "memory/allocation.hpp"
30+
#include "memory/allStatic.hpp"
3131
#include "oops/oop.hpp"
3232

3333
// This file holds platform-dependent routines used to write primitive jni

‎src/hotspot/cpu/arm/bytes_arm.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
#ifndef CPU_ARM_BYTES_ARM_HPP
2626
#define CPU_ARM_BYTES_ARM_HPP
2727

28-
#include "memory/allocation.hpp"
28+
#include "memory/allStatic.hpp"
2929
#include "utilities/macros.hpp"
3030

3131
#ifndef VM_LITTLE_ENDIAN

‎src/hotspot/cpu/arm/jniTypes_arm.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
2626
#define CPU_ARM_JNITYPES_ARM_HPP
2727

2828
#include "jni.h"
29-
#include "memory/allocation.hpp"
29+
#include "memory/allStatic.hpp"
3030
#include "oops/oop.hpp"
3131

3232
// This file holds platform-dependent routines used to write primitive jni

‎src/hotspot/cpu/ppc/bytes_ppc.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
3-
* Copyright (c) 2012, 2016 SAP SE. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2012, 2022 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
66
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
2626
#ifndef CPU_PPC_BYTES_PPC_HPP
2727
#define CPU_PPC_BYTES_PPC_HPP
2828

29-
#include "memory/allocation.hpp"
29+
#include "memory/allStatic.hpp"
3030

3131
class Bytes: AllStatic {
3232
public:

‎src/hotspot/cpu/ppc/jniTypes_ppc.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
3-
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
2+
* Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2012, 2022 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
66
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
2727
#define CPU_PPC_JNITYPES_PPC_HPP
2828

2929
#include "jni.h"
30-
#include "memory/allocation.hpp"
30+
#include "memory/allStatic.hpp"
3131
#include "oops/oop.hpp"
3232

3333
// This file holds platform-dependent routines used to write primitive

‎src/hotspot/cpu/s390/bytes_s390.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
3-
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
2+
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2016, 2022 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
66
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
2626
#ifndef CPU_S390_BYTES_S390_HPP
2727
#define CPU_S390_BYTES_S390_HPP
2828

29-
#include "memory/allocation.hpp"
29+
#include "memory/allStatic.hpp"
3030

3131
class Bytes: AllStatic {
3232
public:

‎src/hotspot/cpu/s390/jniTypes_s390.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2016 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -30,7 +30,7 @@
3030
// jni types to the array of arguments passed into JavaCalls::call.
3131

3232
#include "jni.h"
33-
#include "memory/allocation.hpp"
33+
#include "memory/allStatic.hpp"
3434
#include "oops/oop.hpp"
3535

3636
class JNITypes : AllStatic {

‎src/hotspot/cpu/x86/bytes_x86.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
#ifndef CPU_X86_BYTES_X86_HPP
2626
#define CPU_X86_BYTES_X86_HPP
2727

28-
#include "memory/allocation.hpp"
28+
#include "memory/allStatic.hpp"
2929
#include "utilities/align.hpp"
3030
#include "utilities/macros.hpp"
3131

‎src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
#ifndef CPU_X86_INTELJCCERRATUM_X86_HPP
2626
#define CPU_X86_INTELJCCERRATUM_X86_HPP
2727

28-
#include "memory/allocation.hpp"
28+
#include "memory/allStatic.hpp"
2929
#include "utilities/globalDefinitions.hpp"
3030

3131
class Block;

‎src/hotspot/cpu/x86/jniTypes_x86.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
2626
#define CPU_X86_JNITYPES_X86_HPP
2727

2828
#include "jni.h"
29-
#include "memory/allocation.hpp"
29+
#include "memory/allStatic.hpp"
3030
#include "oops/oop.hpp"
3131

3232
// This file holds platform-dependent routines used to write primitive jni

‎src/hotspot/cpu/x86/rdtsc_x86.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,8 @@
2525
#ifndef CPU_X86_RDTSC_X86_HPP
2626
#define CPU_X86_RDTSC_X86_HPP
2727

28-
#include "memory/allocation.hpp"
28+
#include "memory/allStatic.hpp"
29+
#include "utilities/globalDefinitions.hpp"
2930
#include "utilities/macros.hpp"
3031

3132
// Interface to the x86 rdtsc() time counter, if available.

‎src/hotspot/cpu/zero/bytes_zero.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright 2007, 2008, 2009 Red Hat, Inc.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -26,7 +26,7 @@
2626
#ifndef CPU_ZERO_BYTES_ZERO_HPP
2727
#define CPU_ZERO_BYTES_ZERO_HPP
2828

29-
#include "memory/allocation.hpp"
29+
#include "memory/allStatic.hpp"
3030

3131
typedef union unaligned {
3232
u4 u;

‎src/hotspot/cpu/zero/jniTypes_zero.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
2626
#define CPU_ZERO_JNITYPES_ZERO_HPP
2727

2828
#include "jni.h"
29-
#include "memory/allocation.hpp"
29+
#include "memory/allStatic.hpp"
3030
#include "oops/oop.hpp"
3131

3232
// This file holds platform-dependent routines used to write primitive jni

‎src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#include "precompiled.hpp"
2525
#include "gc/z/zNUMA.hpp"
26+
#include "utilities/globalDefinitions.hpp"
2627

2728
void ZNUMA::pd_initialize() {
2829
_enabled = false;

‎src/hotspot/os/linux/gc/z/zSyscall_linux.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,8 @@
2424
#ifndef OS_LINUX_GC_Z_ZSYSCALL_LINUX_HPP
2525
#define OS_LINUX_GC_Z_ZSYSCALL_LINUX_HPP
2626

27-
#include "memory/allocation.hpp"
27+
#include "memory/allStatic.hpp"
28+
#include "utilities/globalDefinitions.hpp"
2829

2930
// Flags for get_mempolicy()
3031
#ifndef MPOL_F_NODE

‎src/hotspot/os/linux/osContainer_linux.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
2727

2828
#include "utilities/globalDefinitions.hpp"
2929
#include "utilities/macros.hpp"
30-
#include "memory/allocation.hpp"
30+
#include "memory/allStatic.hpp"
3131

3232
#define OSCONTAINER_ERROR (-2)
3333

‎src/hotspot/os/posix/signals_posix.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
#ifndef OS_POSIX_SIGNALS_POSIX_HPP
2626
#define OS_POSIX_SIGNALS_POSIX_HPP
2727

28-
#include "memory/allocation.hpp"
28+
#include "memory/allStatic.hpp"
2929
#include "utilities/globalDefinitions.hpp"
3030

3131
class outputStream;

‎src/hotspot/os/posix/threadLocalStorage_posix.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
2323
*/
2424

2525
#include "runtime/threadLocalStorage.hpp"
26+
#include "utilities/debug.hpp"
2627
#include <pthread.h>
2728

2829
static pthread_key_t _thread_key;

‎src/hotspot/os/windows/gc/z/zMapper_windows.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifndef OS_WINDOWS_GC_Z_ZMAPPER_WINDOWS_HPP
2525
#define OS_WINDOWS_GC_Z_ZMAPPER_WINDOWS_HPP
2626

27-
#include "memory/allocation.hpp"
27+
#include "memory/allStatic.hpp"
2828
#include "utilities/globalDefinitions.hpp"
2929

3030
#include <Windows.h>

‎src/hotspot/os/windows/iphlp_interface.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
#ifndef OS_WINDOWS_IPHLP_INTERFACE_HPP
2626
#define OS_WINDOWS_IPHLP_INTERFACE_HPP
2727

28-
#include "memory/allocation.hpp"
28+
#include "memory/allStatic.hpp"
2929
#include "utilities/macros.hpp"
3030
#include <WinSock2.h>
3131
#include <ws2ipdef.h>

‎src/hotspot/os/windows/pdh_interface.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
#ifndef OS_WINDOWS_PDH_INTERFACE_HPP
2626
#define OS_WINDOWS_PDH_INTERFACE_HPP
2727

28-
#include "memory/allocation.hpp"
28+
#include "memory/allStatic.hpp"
2929
#include <pdh.h>
3030
#include <pdhmsg.h>
3131

‎src/hotspot/os/windows/threadLocalStorage_windows.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#include "precompiled.hpp"
2626
#include "runtime/threadLocalStorage.hpp"
27+
#include "utilities/debug.hpp"
2728
#include <windows.h>
2829

2930
static DWORD _thread_key;

‎src/hotspot/share/c1/c1_Runtime1.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
2828
#include "c1/c1_FrameMap.hpp"
2929
#include "code/stubs.hpp"
3030
#include "interpreter/interpreter.hpp"
31-
#include "memory/allocation.hpp"
31+
#include "memory/allStatic.hpp"
3232
#include "runtime/deoptimization.hpp"
3333

3434
class StubAssembler;

‎src/hotspot/share/cds/archiveUtils.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,9 @@
3939
#include "oops/compressedOops.inline.hpp"
4040
#include "runtime/arguments.hpp"
4141
#include "utilities/bitMap.inline.hpp"
42+
#include "utilities/debug.hpp"
4243
#include "utilities/formatBuffer.hpp"
44+
#include "utilities/globalDefinitions.hpp"
4345

4446
CHeapBitMap* ArchivePtrMarker::_ptrmap = NULL;
4547
VirtualSpace* ArchivePtrMarker::_vs;

0 commit comments

Comments
 (0)