Skip to content

Commit 2af76de

Browse files
8350683: Non-C2 / minimal JVM crashes in the build on ppc64 platforms
Co-authored-by: Martin Doerr <[email protected]> Reviewed-by: mdoerr, amitkumar
1 parent ab4b0ef commit 2af76de

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/hotspot/cpu/ppc/compiledIC_ppc.cpp

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
3-
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
3+
* Copyright (c) 2012, 2025 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
@@ -29,9 +29,6 @@
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

@@ -78,7 +75,6 @@
7875
const int IC_pos_in_java_to_interp_stub = 8;
7976
#define __ masm->
8077
address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark/* = nullptr*/) {
81-
#ifdef COMPILER2
8278
if (mark == nullptr) {
8379
// Get the mark within main instrs section which is set to the address of the call.
8480
mark = __ inst_mark();
@@ -108,7 +104,7 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
108104
// - call
109105
__ calculate_address_from_global_toc(reg_scratch, __ method_toc());
110106
AddressLiteral ic = __ allocate_metadata_address((Metadata *)nullptr);
111-
bool success = __ load_const_from_method_toc(as_Register(Matcher::inline_cache_reg_encode()),
107+
bool success = __ load_const_from_method_toc(R19_inline_cache_reg,
112108
ic, reg_scratch, /*fixed_size*/ true);
113109
if (!success) {
114110
return nullptr; // CodeCache is full
@@ -134,13 +130,9 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
134130
assert(!is_NativeCallTrampolineStub_at(__ addr_at(stub_start_offset)),
135131
"must not confuse java_to_interp with trampoline stubs");
136132

137-
// End the stub.
133+
// End the stub.
138134
__ end_a_stub();
139135
return stub;
140-
#else
141-
ShouldNotReachHere();
142-
return nullptr;
143-
#endif
144136
}
145137
#undef __
146138

0 commit comments

Comments
 (0)