Skip to content

Commit 85d2d44

Browse files
committed
fix
1 parent bfac97c commit 85d2d44

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

src/hotspot/cpu/s390/compiledIC_s390.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2016, 2019 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -29,17 +29,13 @@
2929
#include "memory/resourceArea.hpp"
3030
#include "runtime/mutexLocker.hpp"
3131
#include "runtime/safepoint.hpp"
32-
#ifdef COMPILER2
33-
#include "opto/matcher.hpp"
34-
#endif
3532

3633
// ----------------------------------------------------------------------------
3734

3835
#undef __
3936
#define __ masm->
4037

4138
address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark/* = nullptr*/) {
42-
#ifdef COMPILER2
4339
// Stub is fixed up when the corresponding call is converted from calling
4440
// compiled code to calling interpreted code.
4541
if (mark == nullptr) {
@@ -55,7 +51,7 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
5551
__ relocate(static_stub_Relocation::spec(mark));
5652

5753
AddressLiteral meta = __ allocate_metadata_address(nullptr);
58-
bool success = __ load_const_from_toc(as_Register(Matcher::inline_cache_reg_encode()), meta);
54+
bool success = __ load_const_from_toc(Z_inline_cache, meta);
5955

6056
__ set_inst_mark();
6157
AddressLiteral a((address)-1);
@@ -67,10 +63,6 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
6763
__ z_br(Z_R1);
6864
__ end_a_stub(); // Update current stubs pointer and restore insts_end.
6965
return stub;
70-
#else
71-
ShouldNotReachHere();
72-
return nullptr;
73-
#endif
7466
}
7567

7668
#undef __

0 commit comments

Comments
 (0)