Skip to content

Commit 2f06893

Browse files
committed
8252526: Remove excessive inclusion of jvmti.h and jvmtiExport.hpp
Reviewed-by: ihse, kbarrett
1 parent ccb48b7 commit 2f06893

Some content is hidden

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

65 files changed

+198
-107
lines changed

src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "memory/resourceArea.hpp"
3131
#include "prims/jniFastGetField.hpp"
3232
#include "prims/jvm_misc.hpp"
33+
#include "prims/jvmtiExport.hpp"
3334
#include "runtime/safepoint.hpp"
3435

3536
#define __ masm->

src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "interpreter/interpreter.hpp"
3030
#include "interpreter/interpreterRuntime.hpp"
3131
#include "memory/allocation.inline.hpp"
32+
#include "prims/jvmtiExport.hpp"
3233
#include "prims/methodHandles.hpp"
3334
#include "runtime/flags/flagSetting.hpp"
3435
#include "runtime/frame.inline.hpp"

src/hotspot/cpu/aarch64/templateTable_aarch64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "oops/method.hpp"
3636
#include "oops/objArrayKlass.hpp"
3737
#include "oops/oop.inline.hpp"
38+
#include "prims/jvmtiExport.hpp"
3839
#include "prims/methodHandles.hpp"
3940
#include "runtime/frame.inline.hpp"
4041
#include "runtime/sharedRuntime.hpp"

src/hotspot/cpu/arm/jniFastGetField_arm.cpp

Lines changed: 2 additions & 1 deletion
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, 2020, 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,6 +28,7 @@
2828
#include "memory/resourceArea.hpp"
2929
#include "prims/jniFastGetField.hpp"
3030
#include "prims/jvm_misc.hpp"
31+
#include "prims/jvmtiExport.hpp"
3132
#include "runtime/safepoint.hpp"
3233

3334
#define __ masm->

src/hotspot/cpu/arm/methodHandles_arm.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "logging/log.hpp"
3535
#include "memory/allocation.inline.hpp"
3636
#include "memory/resourceArea.hpp"
37+
#include "prims/jvmtiExport.hpp"
3738
#include "prims/methodHandles.hpp"
3839
#include "runtime/frame.inline.hpp"
3940
#include "utilities/preserveException.hpp"

src/hotspot/cpu/arm/templateTable_arm.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "oops/methodData.hpp"
3535
#include "oops/objArrayKlass.hpp"
3636
#include "oops/oop.inline.hpp"
37+
#include "prims/jvmtiExport.hpp"
3738
#include "prims/methodHandles.hpp"
3839
#include "runtime/frame.inline.hpp"
3940
#include "runtime/sharedRuntime.hpp"

src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "interp_masm_ppc.hpp"
3232
#include "interpreter/interpreterRuntime.hpp"
3333
#include "oops/methodData.hpp"
34+
#include "prims/jvmtiExport.hpp"
3435
#include "prims/jvmtiThreadState.hpp"
3536
#include "runtime/frame.inline.hpp"
3637
#include "runtime/safepointMechanism.hpp"

src/hotspot/cpu/ppc/jniFastGetField_ppc.cpp

Lines changed: 2 additions & 1 deletion
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, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2019 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -30,6 +30,7 @@
3030
#include "memory/resourceArea.hpp"
3131
#include "prims/jniFastGetField.hpp"
3232
#include "prims/jvm_misc.hpp"
33+
#include "prims/jvmtiExport.hpp"
3334
#include "runtime/safepoint.hpp"
3435

3536
#define __ masm->

src/hotspot/cpu/ppc/methodHandles_ppc.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "logging/log.hpp"
3232
#include "memory/allocation.inline.hpp"
3333
#include "memory/resourceArea.hpp"
34+
#include "prims/jvmtiExport.hpp"
3435
#include "prims/methodHandles.hpp"
3536
#include "runtime/frame.inline.hpp"
3637
#include "utilities/preserveException.hpp"

src/hotspot/cpu/ppc/templateTable_ppc_64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "oops/methodData.hpp"
3737
#include "oops/objArrayKlass.hpp"
3838
#include "oops/oop.inline.hpp"
39+
#include "prims/jvmtiExport.hpp"
3940
#include "prims/methodHandles.hpp"
4041
#include "runtime/frame.inline.hpp"
4142
#include "runtime/safepointMechanism.hpp"

0 commit comments

Comments
 (0)