Skip to content

Commit

Permalink
8260471: Change SystemDictionary::X_klass calls to vmClasses::X_klass
Browse files Browse the repository at this point in the history
Reviewed-by: lfoltan, hseigel, dholmes, stuefe
  • Loading branch information
iklam committed Feb 2, 2021
1 parent 9af3339 commit ffbcf1b
Show file tree
Hide file tree
Showing 191 changed files with 739 additions and 712 deletions.
1 change: 0 additions & 1 deletion src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -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.
*
Expand Down Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/arm/methodHandles_arm.cpp
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/arm/methodHandles_arm.hpp
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/hotspot/cpu/arm/runtime_arm.cpp
@@ -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
Expand All @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/ppc/methodHandles_ppc.cpp
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/ppc/methodHandles_ppc.hpp
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -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.
*
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/s390/methodHandles_s390.cpp
Expand Up @@ -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,