Skip to content
Permalink
Browse files
8260471: Change SystemDictionary::X_klass calls to vmClasses::X_klass
Reviewed-by: lfoltan, hseigel, dholmes, stuefe
  • Loading branch information
iklam committed Feb 2, 2021
1 parent 9af3339 commit ffbcf1b0a7d9484e95a82f667fcbabd290449711
Showing with 739 additions and 712 deletions.
  1. +0 −1 src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
  2. +1 −1 src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
  3. +1 −1 src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
  4. +1 −2 src/hotspot/cpu/aarch64/runtime_aarch64.cpp
  5. +1 −0 src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
  6. +0 −1 src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
  7. +1 −1 src/hotspot/cpu/arm/methodHandles_arm.cpp
  8. +1 −1 src/hotspot/cpu/arm/methodHandles_arm.hpp
  9. +1 −2 src/hotspot/cpu/arm/runtime_arm.cpp
  10. +0 −1 src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
  11. +1 −1 src/hotspot/cpu/ppc/methodHandles_ppc.cpp
  12. +1 −1 src/hotspot/cpu/ppc/methodHandles_ppc.hpp
  13. +1 −2 src/hotspot/cpu/ppc/runtime_ppc.cpp
  14. +1 −0 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
  15. +0 −1 src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
  16. +1 −1 src/hotspot/cpu/s390/methodHandles_s390.cpp
  17. +1 −1 src/hotspot/cpu/s390/methodHandles_s390.hpp
  18. +1 −2 src/hotspot/cpu/s390/runtime_s390.cpp
  19. +2 −1 src/hotspot/cpu/s390/sharedRuntime_s390.cpp
  20. +0 −1 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
  21. +1 −1 src/hotspot/cpu/x86/methodHandles_x86.cpp
  22. +1 −1 src/hotspot/cpu/x86/methodHandles_x86.hpp
  23. +1 −2 src/hotspot/cpu/x86/runtime_x86_32.cpp
  24. +1 −2 src/hotspot/cpu/x86/runtime_x86_64.cpp
  25. +1 −0 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
  26. +1 −0 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
  27. +1 −2 src/hotspot/cpu/zero/compiledIC_zero.cpp
  28. +0 −1 src/hotspot/os/aix/os_aix.cpp
  29. +0 −1 src/hotspot/os/bsd/os_bsd.cpp
  30. +0 −1 src/hotspot/os/linux/os_linux.cpp
  31. +0 −1 src/hotspot/os/windows/os_windows.cpp
  32. +1 −2 src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
  33. +1 −2 src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
  34. +1 −2 src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
  35. +1 −2 src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
  36. +1 −2 src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
  37. +0 −1 src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
  38. +1 −2 src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
  39. +1 −2 src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
  40. +1 −2 src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
  41. +0 −1 src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp
  42. +1 −2 src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
  43. +3 −1 src/hotspot/share/aot/aotCodeHeap.cpp
  44. +3 −3 src/hotspot/share/c1/c1_Runtime1.cpp
  45. +2 −1 src/hotspot/share/ci/ciEnv.cpp
  46. +6 −6 src/hotspot/share/ci/ciField.cpp
  47. +3 −3 src/hotspot/share/ci/ciInstance.cpp
  48. +5 −5 src/hotspot/share/ci/ciInstanceKlass.cpp
  49. +0 −1 src/hotspot/share/ci/ciMethod.cpp
  50. +1 −1 src/hotspot/share/ci/ciObjArrayKlass.cpp
  51. +4 −3 src/hotspot/share/ci/ciObjectFactory.cpp
  52. +1 −0 src/hotspot/share/ci/ciReplay.cpp
  53. +1 −2 src/hotspot/share/ci/ciType.cpp
  54. +4 −4 src/hotspot/share/classfile/altHashing.cpp
  55. +6 −5 src/hotspot/share/classfile/classFileParser.cpp
  56. +2 −1 src/hotspot/share/classfile/classListParser.cpp
  57. +2 −1 src/hotspot/share/classfile/classLoader.cpp
  58. +5 −4 src/hotspot/share/classfile/classLoaderData.cpp
  59. +1 −0 src/hotspot/share/classfile/classLoaderDataShared.cpp
  60. +2 −1 src/hotspot/share/classfile/classLoaderExt.cpp
  61. +4 −3 src/hotspot/share/classfile/defaultMethods.cpp
  62. +4 −3 src/hotspot/share/classfile/javaAssertions.cpp
  63. +80 −79 src/hotspot/share/classfile/javaClasses.cpp
  64. +13 −14 src/hotspot/share/classfile/javaClasses.hpp
  65. +8 −7 src/hotspot/share/classfile/javaClasses.inline.hpp
  66. +3 −2 src/hotspot/share/classfile/lambdaFormInvokers.cpp
  67. +4 −3 src/hotspot/share/classfile/modules.cpp
  68. +1 −2 src/hotspot/share/classfile/protectionDomainCache.cpp
  69. +3 −3 src/hotspot/share/classfile/stringTable.cpp
  70. +17 −17 src/hotspot/share/classfile/systemDictionary.cpp
  71. +1 −5 src/hotspot/share/classfile/systemDictionary.hpp
  72. +14 −13 src/hotspot/share/classfile/systemDictionaryShared.cpp
  73. +5 −3 src/hotspot/share/classfile/verificationType.cpp
  74. +1 −2 src/hotspot/share/classfile/verificationType.hpp
  75. +3 −2 src/hotspot/share/classfile/verifier.cpp
  76. +2 −2 src/hotspot/share/classfile/vmClassID.hpp
  77. +3 −3 src/hotspot/share/classfile/vmClassMacros.hpp
  78. +11 −11 src/hotspot/share/classfile/vmClasses.cpp
  79. +10 −10 src/hotspot/share/classfile/vmClasses.hpp
  80. +1 −2 src/hotspot/share/code/compiledIC.cpp
  81. +4 −3 src/hotspot/share/code/dependencies.cpp
  82. +1 −0 src/hotspot/share/code/nmethod.cpp
  83. +4 −4 src/hotspot/share/compiler/compileBroker.cpp
  84. +1 −0 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
  85. +2 −1 src/hotspot/share/gc/g1/g1FullCollector.cpp
  86. +3 −3 src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
  87. +1 −2 src/hotspot/share/gc/parallel/psCompactionManager.cpp
  88. +2 −2 src/hotspot/share/gc/shared/collectedHeap.cpp
  89. +0 −1 src/hotspot/share/gc/shared/referenceProcessor.cpp
  90. +3 −3 src/hotspot/share/gc/shared/space.cpp
  91. +0 −1 src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
  92. +1 −0 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
  93. +4 −2 src/hotspot/share/interpreter/bootstrapInfo.cpp
  94. +3 −3 src/hotspot/share/interpreter/bytecodeUtils.cpp
  95. +9 −9 src/hotspot/share/interpreter/interpreterRuntime.cpp
  96. +16 −15 src/hotspot/share/interpreter/linkResolver.cpp
  97. +4 −3 src/hotspot/share/interpreter/rewriter.cpp
  98. +2 −1 src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
  99. +7 −7 src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
  100. +7 −7 src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.cpp
  101. +6 −5 src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
  102. +2 −1 src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp
  103. +2 −1 src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
  104. +1 −0 src/hotspot/share/jvmci/compilerRuntime.cpp
  105. +2 −1 src/hotspot/share/jvmci/jvmciCompiler.cpp
  106. +11 −9 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
  107. +2 −1 src/hotspot/share/jvmci/jvmciEnv.cpp
  108. +4 −2 src/hotspot/share/jvmci/jvmciJavaClasses.cpp
  109. +6 −4 src/hotspot/share/jvmci/jvmciRuntime.cpp
  110. +3 −2 src/hotspot/share/memory/archiveUtils.cpp
  111. +3 −3 src/hotspot/share/memory/heapInspection.cpp
  112. +5 −4 src/hotspot/share/memory/heapShared.cpp
  113. +1 −2 src/hotspot/share/memory/oopFactory.cpp
  114. +20 −19 src/hotspot/share/memory/universe.cpp
  115. +4 −4 src/hotspot/share/oops/arrayKlass.cpp
  116. +2 −2 src/hotspot/share/oops/arrayKlass.hpp
  117. +5 −4 src/hotspot/share/oops/constantPool.cpp
  118. +5 −3 src/hotspot/share/oops/cpCache.cpp
  119. +18 −17 src/hotspot/share/oops/instanceKlass.cpp
  120. +1 −2 src/hotspot/share/oops/instanceMirrorKlass.cpp
  121. +3 −3 src/hotspot/share/oops/instanceMirrorKlass.hpp
  122. +3 −3 src/hotspot/share/oops/instanceRefKlass.cpp
  123. +5 −4 src/hotspot/share/oops/klass.cpp
  124. +7 −6 src/hotspot/share/oops/method.cpp
  125. +1 −1 src/hotspot/share/oops/methodData.cpp
  126. +6 −6 src/hotspot/share/oops/objArrayKlass.cpp
  127. +6 −5 src/hotspot/share/oops/reflectionAccessorImplKlassHelper.cpp
  128. +1 −2 src/hotspot/share/oops/typeArrayKlass.cpp
  129. +1 −2 src/hotspot/share/opto/bytecodeInfo.cpp
  130. +2 −2 src/hotspot/share/opto/c2compiler.cpp
  131. +1 −2 src/hotspot/share/opto/cfgnode.cpp
  132. +0 −1 src/hotspot/share/opto/library_call.cpp
  133. +0 −1 src/hotspot/share/opto/parse2.cpp
  134. +1 −2 src/hotspot/share/opto/parseHelper.cpp
  135. +4 −4 src/hotspot/share/opto/runtime.cpp
  136. +7 −6 src/hotspot/share/prims/jni.cpp
  137. +3 −3 src/hotspot/share/prims/jniCheck.cpp
  138. +39 −38 src/hotspot/share/prims/jvm.cpp
  139. +2 −1 src/hotspot/share/prims/jvmtiEnter.xsl
  140. +4 −3 src/hotspot/share/prims/jvmtiEnv.cpp
  141. +0 −1 src/hotspot/share/prims/jvmtiEnvBase.cpp
  142. +1 −2 src/hotspot/share/prims/jvmtiEnvThreadState.cpp
  143. +11 −11 src/hotspot/share/prims/jvmtiExport.cpp
  144. +1 −2 src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
  145. +1 −2 src/hotspot/share/prims/jvmtiImpl.cpp
  146. +1 −2 src/hotspot/share/prims/jvmtiImpl.hpp
  147. +4 −3 src/hotspot/share/prims/jvmtiRedefineClasses.cpp
  148. +11 −11 src/hotspot/share/prims/jvmtiTagMap.cpp
  149. +1 −2 src/hotspot/share/prims/jvmtiTrace.hpp
  150. +15 −14 src/hotspot/share/prims/methodHandles.cpp
  151. +4 −2 src/hotspot/share/prims/methodHandles.hpp
  152. +2 −1 src/hotspot/share/prims/nativeLookup.cpp
  153. +7 −6 src/hotspot/share/prims/stackwalk.cpp
  154. +2 −1 src/hotspot/share/prims/unsafe.cpp
  155. +6 −5 src/hotspot/share/prims/vectorSupport.cpp
  156. +3 −2 src/hotspot/share/prims/wbtestmethods/parserTests.cpp
  157. +1 −0 src/hotspot/share/prims/whitebox.cpp
  158. +3 −2 src/hotspot/share/runtime/deoptimization.cpp
  159. +1 −2 src/hotspot/share/runtime/fieldDescriptor.cpp
  160. +2 −1 src/hotspot/share/runtime/fieldDescriptor.inline.hpp
  161. +1 −2 src/hotspot/share/runtime/frame.inline.hpp
  162. +1 −2 src/hotspot/share/runtime/javaCalls.cpp
  163. +1 −2 src/hotspot/share/runtime/memprofiler.cpp
  164. +3 −2 src/hotspot/share/runtime/monitorDeflationThread.cpp
  165. +4 −3 src/hotspot/share/runtime/notificationThread.cpp
  166. +3 −2 src/hotspot/share/runtime/os.cpp
  167. +6 −6 src/hotspot/share/runtime/reflection.cpp
  168. +4 −3 src/hotspot/share/runtime/reflectionUtils.cpp
  169. +0 −1 src/hotspot/share/runtime/safepoint.cpp
  170. +2 −1 src/hotspot/share/runtime/serviceThread.cpp
  171. +3 −3 src/hotspot/share/runtime/sharedRuntime.cpp
  172. +3 −3 src/hotspot/share/runtime/statSampler.cpp
  173. +14 −13 src/hotspot/share/runtime/thread.cpp
  174. +4 −4 src/hotspot/share/runtime/vframe.cpp
  175. +5 −4 src/hotspot/share/services/attachListener.cpp
  176. +3 −2 src/hotspot/share/services/classLoadingService.cpp
  177. +4 −2 src/hotspot/share/services/diagnosticCommand.cpp
  178. +4 −4 src/hotspot/share/services/gcNotifier.cpp
  179. +3 −3 src/hotspot/share/services/heapDumper.cpp
  180. +4 −4 src/hotspot/share/services/lowMemoryDetector.cpp
  181. +11 −10 src/hotspot/share/services/management.cpp
  182. +1 −2 src/hotspot/share/services/memoryManager.cpp
  183. +0 −1 src/hotspot/share/services/memoryPool.cpp
  184. +1 −2 src/hotspot/share/services/memoryService.cpp
  185. +7 −6 src/hotspot/share/services/threadService.cpp
  186. +11 −10 src/hotspot/share/utilities/exceptions.cpp
  187. +3 −2 src/hotspot/share/utilities/hashtable.cpp
  188. +1 −1 src/hotspot/share/utilities/vmEnums.hpp
  189. +3 −3 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
  190. +4 −4 test/hotspot/gtest/oops/test_instanceKlass.cpp
  191. +4 −3 test/hotspot/gtest/oops/test_markWord.cpp
@@ -26,7 +26,6 @@
#include "precompiled.hpp"
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/barrierSetAssembler.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/tlab_globals.hpp"
@@ -65,7 +65,7 @@ static int check_nonzero(const char* xname, int x) {

#ifdef ASSERT
void MethodHandles::verify_klass(MacroAssembler* _masm,
Register obj, VMClassID klass_id,
Register obj, vmClassID klass_id,
const char* error_message) {
InstanceKlass** klass_addr = vmClasses::klass_addr_at(klass_id);
Klass* klass = vmClasses::klass_at(klass_id);
@@ -36,7 +36,7 @@ enum /* platform_dependent_constants */ {
static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg);

static void verify_klass(MacroAssembler* _masm,
Register obj, VMClassID klass_id,
Register obj, vmClassID klass_id,
const char* error_message = "wrong klass") NOT_DEBUG_RETURN;

static void verify_method_handle(MacroAssembler* _masm, Register mh_reg) {
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -27,7 +27,6 @@
#ifdef COMPILER2
#include "asm/macroAssembler.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/vmreg.hpp"
#include "interpreter/interpreter.hpp"
#include "opto/runtime.hpp"
@@ -41,6 +41,7 @@
#include "prims/methodHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/align.hpp"
@@ -25,7 +25,6 @@
#include "precompiled.hpp"
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/tlab_globals.hpp"
#include "interpreter/interpreter.hpp"
@@ -72,7 +72,7 @@ static int check_nonzero(const char* xname, int x) {

#ifdef ASSERT
void MethodHandles::verify_klass(MacroAssembler* _masm,
Register obj, Register temp1, Register temp2, VMClassID klass_id,
Register obj, Register temp1, Register temp2, vmClassID klass_id,
const char* error_message) {
InstanceKlass** klass_addr = vmClasses::klass_addr_at(klass_id);
Klass* klass = vmClasses::klass_at(klass_id);
@@ -35,7 +35,7 @@ enum /* platform_dependent_constants */ {
static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg, Register temp1, Register temp2);

static void verify_klass(MacroAssembler* _masm,
Register obj, Register temp1, Register temp2, VMClassID klass_id,
Register obj, Register temp1, Register temp2, vmClassID klass_id,
const char* error_message = "wrong klass") NOT_DEBUG_RETURN;

static void verify_ref_kind(MacroAssembler* _masm, int ref_kind, Register member_reg, Register temp) NOT_DEBUG_RETURN;
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2021, 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,6 @@
#ifdef COMPILER2
#include "asm/assembler.hpp"
#include "assembler_arm.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/vmreg.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/resourceArea.hpp"
@@ -27,7 +27,6 @@
#include "asm/macroAssembler.inline.hpp"
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/tlab_globals.hpp"
#include "interpreter/interpreter.hpp"
@@ -75,7 +75,7 @@ static int check_nonzero(const char* xname, int x) {

#ifdef ASSERT
void MethodHandles::verify_klass(MacroAssembler* _masm,
Register obj_reg, VMClassID klass_id,
Register obj_reg, vmClassID klass_id,
Register temp_reg, Register temp2_reg,
const char* error_message) {
InstanceKlass** klass_addr = vmClasses::klass_addr_at(klass_id);
@@ -36,7 +36,7 @@ enum /* platform_dependent_constants */ {
static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg, Register temp_reg, Register temp2_reg);

static void verify_klass(MacroAssembler* _masm,
Register obj_reg, VMClassID klass_id,
Register obj_reg, vmClassID klass_id,
Register temp_reg, Register temp2_reg,
const char* error_message = "wrong klass") NOT_DEBUG_RETURN;

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -26,7 +26,6 @@
#include "precompiled.hpp"
#ifdef COMPILER2
#include "asm/macroAssembler.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/vmreg.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/interp_masm.hpp"
@@ -38,6 +38,7 @@
#include "prims/methodHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/align.hpp"
@@ -27,7 +27,6 @@
#include "asm/macroAssembler.inline.hpp"
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/tlab_globals.hpp"
#include "interpreter/interpreter.hpp"
@@ -76,7 +76,7 @@ static int check_nonzero(const char* xname, int x) {

#ifdef ASSERT
void MethodHandles::verify_klass(MacroAssembler* _masm,
Register obj_reg, VMClassID klass_id,
Register obj_reg, vmClassID klass_id,
Register temp_reg, Register temp2_reg,
const char* error_message) {

@@ -36,7 +36,7 @@
static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg, Register temp_reg, Register temp2_reg);

static void verify_klass(MacroAssembler* _masm,
Register obj_reg, VMClassID klass_id,
Register obj_reg, vmClassID klass_id,
Register temp_reg, Register temp2_reg,
const char* error_message = "wrong klass") NOT_DEBUG_RETURN;

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -26,7 +26,6 @@
#include "precompiled.hpp"
#ifdef COMPILER2
#include "asm/macroAssembler.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/vmreg.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/resourceArea.hpp"
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -39,6 +39,7 @@
#include "registerSaver_s390.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/align.hpp"
@@ -25,7 +25,6 @@
#include "precompiled.hpp"
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/barrierSet.hpp"
#include "gc/shared/barrierSetAssembler.hpp"
#include "gc/shared/collectedHeap.hpp"
@@ -72,7 +72,7 @@ static int check_nonzero(const char* xname, int x) {

#ifdef ASSERT
void MethodHandles::verify_klass(MacroAssembler* _masm,
Register obj, VMClassID klass_id,
Register obj, vmClassID klass_id,
const char* error_message) {
InstanceKlass** klass_addr = vmClasses::klass_addr_at(klass_id);
Klass* klass = vmClasses::klass_at(klass_id);
@@ -35,7 +35,7 @@ enum /* platform_dependent_constants */ {
static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg);

static void verify_klass(MacroAssembler* _masm,
Register obj, VMClassID klass_id,
Register obj, vmClassID klass_id,
const char* error_message = "wrong klass") NOT_DEBUG_RETURN;

static void verify_method_handle(MacroAssembler* _masm, Register mh_reg) {
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021, 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,6 @@
#ifdef COMPILER2
#include "asm/macroAssembler.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/vmreg.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/resourceArea.hpp"
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2021, 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,6 @@
#ifdef COMPILER2
#include "asm/macroAssembler.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/vmreg.hpp"
#include "interpreter/interpreter.hpp"
#include "opto/runtime.hpp"
@@ -40,6 +40,7 @@
#include "prims/methodHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/vframeArray.hpp"
#include "runtime/vm_version.hpp"
@@ -45,6 +45,7 @@
#include "prims/methodHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/vframeArray.hpp"
#include "runtime/vm_version.hpp"
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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 "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "code/compiledIC.hpp"
#include "code/icBuffer.hpp"
@@ -30,7 +30,6 @@
// no precompiled headers
#include "jvm.h"
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/icBuffer.hpp"
#include "code/vtableStubs.hpp"
@@ -25,7 +25,6 @@
// no precompiled headers
#include "jvm.h"
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/icBuffer.hpp"
#include "code/vtableStubs.hpp"
@@ -25,7 +25,6 @@
// no precompiled headers
#include "jvm.h"
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/icBuffer.hpp"
#include "code/vtableStubs.hpp"
@@ -28,7 +28,6 @@
// no precompiled headers
#include "jvm.h"
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2020 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -28,7 +28,6 @@
#include "assembler_ppc.hpp"
#include "asm/assembler.inline.hpp"
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2021, 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,6 @@
#include "jvm.h"
#include "asm/macroAssembler.hpp"
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"