Skip to content

Commit 6dcd34d

Browse files
axel7bornaxel7born
authored
Merge pull request #103 from SAP/pr-jdk-11+11
Merge to tag jdk-11+11
2 parents 3b57213 + 5ad645f commit 6dcd34d

File tree

843 files changed

+17316
-10520
lines changed

Some content is hidden

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

843 files changed

+17316
-10520
lines changed

‎.hgtags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,3 +481,4 @@ f7363de371c9a1f668bd0a01b7df3d1ddb9cc58b jdk-11+7
481481
755e1b55a4dff510f9639cdb5c5e82549a7e09b3 jdk-11+8
482482
0c3e252cea44f06aef570ef464950ab97c669970 jdk-11+9
483483
6fa770f9f8ab296e1ce255ec17ccf6d4e1051886 jdk-10+46
484+
69d7398038c54774d9395b6810e0cca335edc02c jdk-11+10

‎make/CompileJavaModules.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
439439
#
440440

441441
jdk.internal.vm.compiler_EXCLUDES += \
442-
org.graalvm.collections.test \
442+
jdk.internal.vm.compiler.collections.test \
443443
org.graalvm.compiler.core.match.processor \
444444
org.graalvm.compiler.nodeinfo.processor \
445445
org.graalvm.compiler.options.processor \

‎make/CompileToolsHotspot.gmk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ ifeq ($(INCLUDE_GRAAL), true)
4747
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_MATCH_PROCESSOR, \
4848
SETUP := GENERATE_OLDBYTECODE, \
4949
SRC := \
50-
$(SRC_DIR)/org.graalvm.word/src \
51-
$(SRC_DIR)/org.graalvm.collections/src \
50+
$(SRC_DIR)/jdk.internal.vm.compiler.word/src \
51+
$(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
5252
$(SRC_DIR)/org.graalvm.compiler.core/src \
5353
$(SRC_DIR)/org.graalvm.compiler.core.common/src \
5454
$(SRC_DIR)/org.graalvm.compiler.core.match.processor/src \
@@ -102,7 +102,7 @@ ifeq ($(INCLUDE_GRAAL), true)
102102
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_OPTIONS_PROCESSOR, \
103103
SETUP := GENERATE_OLDBYTECODE, \
104104
SRC := \
105-
$(SRC_DIR)/org.graalvm.collections/src \
105+
$(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
106106
$(SRC_DIR)/org.graalvm.compiler.options/src \
107107
$(SRC_DIR)/org.graalvm.compiler.options.processor/src \
108108
$(SRC_DIR)/org.graalvm.util/src \
@@ -118,8 +118,8 @@ ifeq ($(INCLUDE_GRAAL), true)
118118
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_REPLACEMENTS_VERIFIER, \
119119
SETUP := GENERATE_OLDBYTECODE, \
120120
SRC := \
121-
$(SRC_DIR)/org.graalvm.word/src \
122-
$(SRC_DIR)/org.graalvm.collections/src \
121+
$(SRC_DIR)/jdk.internal.vm.compiler.word/src \
122+
$(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
123123
$(SRC_DIR)/org.graalvm.compiler.bytecode/src \
124124
$(SRC_DIR)/org.graalvm.compiler.replacements.verifier/src \
125125
$(SRC_DIR)/org.graalvm.compiler.api.replacements/src \

‎make/Images.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ JLINK_ORDER_RESOURCES += \
117117

118118
JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
119119
--module-path $(IMAGES_OUTPUTDIR)/jmods \
120-
--endian $(OPENJDK_BUILD_CPU_ENDIAN) \
120+
--endian $(OPENJDK_TARGET_CPU_ENDIAN) \
121121
--release-info $(BASE_RELEASE_FILE) \
122122
--order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
123123
--dedup-legal-notices=error-if-not-same-content \

‎make/Init.gmk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,13 @@ else # HAS_SPEC=true
310310
ifneq ($(PARALLEL_TARGETS), )
311311
$(call StartGlobalTimer)
312312
$(call PrepareSmartJavac)
313+
# JOBS will only be empty for a bootcycle-images recursive call
314+
# or if specified via a make argument directly. In those cases
315+
# treat it as NOT using jobs at all.
313316
( cd $(TOPDIR) && \
314317
$(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
315-
-j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
318+
$(if $(JOBS), -j $(JOBS)) \
319+
-f make/Main.gmk $(USER_MAKE_VARS) \
316320
$(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
317321
( exitcode=$$? && \
318322
$(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \

‎make/autoconf/flags.m4

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,17 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
233233
# The sysroot flags are needed for configure to be able to run the compilers
234234
FLAGS_SETUP_SYSROOT_FLAGS
235235
236+
# For solstudio and xlc, the word size flag is required for correct behavior.
237+
# For clang/gcc, the flag is only strictly required for reduced builds, but
238+
# set it always where possible (x86, sparc and ppc).
236239
if test "x$TOOLCHAIN_TYPE" = xxlc; then
237240
MACHINE_FLAG="-q${OPENJDK_TARGET_CPU_BITS}"
238-
elif test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
239-
if test "x$OPENJDK_TARGET_CPU" != xaarch64 &&
240-
test "x$OPENJDK_TARGET_CPU" != xarm &&
241-
test "x$OPENJDK_TARGET_CPU" != xmips &&
242-
test "x$OPENJDK_TARGET_CPU" != xmipsel &&
243-
test "x$OPENJDK_TARGET_CPU" != xmips64 &&
244-
test "x$OPENJDK_TARGET_CPU" != xmips64el; then
241+
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
242+
MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
243+
elif test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
244+
if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86 ||
245+
test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc ||
246+
test "x$OPENJDK_TARGET_CPU_ARCH" = xppc; then
245247
MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
246248
fi
247249
fi

‎make/common/Modules.gmk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ BOOT_MODULES += \
7676
UPGRADEABLE_MODULES += \
7777
java.compiler \
7878
jdk.internal.vm.compiler \
79+
jdk.internal.vm.compiler.management \
7980
#
8081

8182

@@ -103,7 +104,6 @@ PLATFORM_MODULES += \
103104
jdk.crypto.ec \
104105
jdk.dynalink \
105106
jdk.httpserver \
106-
jdk.internal.vm.compiler.management \
107107
jdk.jsobject \
108108
jdk.localedata \
109109
jdk.naming.dns \
@@ -189,6 +189,7 @@ HOTSPOT_MODULES := \
189189
jdk.hotspot.agent \
190190
jdk.internal.vm.ci \
191191
jdk.internal.vm.compiler \
192+
jdk.internal.vm.compiler.management \
192193
#
193194

194195
################################################################################

‎make/data/charsetmapping/charsets

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2000, 2018, 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
@@ -326,6 +326,8 @@ charset windows-1252 MS1252
326326
ascii true
327327
alias cp1252 # JDK historical
328328
alias cp5348 # Euro IBM CCSID
329+
alias ibm-1252
330+
alias ibm1252
329331

330332
charset windows-1253 MS1253
331333
package sun.nio.cs
@@ -933,11 +935,16 @@ charset x-IBM942 IBM942 # IBM & PC/MSDOS encodings
933935

934936
charset x-IBM942C IBM942C
935937
package sun.nio.cs.ext
936-
type source
938+
type template
937939
alias cp942C # JDK historical
938940
alias ibm942C
939941
alias ibm-942C
940942
alias 942C
943+
alias cp932
944+
alias ibm932
945+
alias ibm-932
946+
alias 932
947+
alias x-ibm932
941948

942949
charset x-IBM943 IBM943
943950
package sun.nio.cs.ext
@@ -952,7 +959,7 @@ charset x-IBM943 IBM943
952959

953960
charset x-IBM943C IBM943C
954961
package sun.nio.cs.ext
955-
type source
962+
type template
956963
alias cp943C # JDK historical
957964
alias ibm943C
958965
alias ibm-943C
@@ -1519,6 +1526,9 @@ charset x-IBM1383 IBM1383
15191526
alias ibm1383
15201527
alias ibm-1383
15211528
alias 1383
1529+
alias ibmeuccn
1530+
alias ibm-euccn
1531+
alias cpeuccn
15221532

15231533
charset x-IBM970 IBM970
15241534
package sun.nio.cs.ext

‎make/data/charsetmapping/stdcs-aix

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
#
22
# generate these charsets into sun.nio.cs
33
#
4+
Big5
5+
Big5_Solaris
6+
Big5_HKSCS
47
EUC_CN
58
EUC_KR
69
GBK
10+
GB18030
11+
IBM856
12+
IBM921
13+
IBM922
14+
IBM942
15+
IBM942C
16+
IBM943
17+
IBM943C
18+
IBM950
19+
IBM970
20+
IBM1046
21+
IBM1124
22+
IBM1383
23+
ISO_8859_6
24+
ISO_8859_8
25+
MS1252
26+
TIS_620

‎make/jdk/src/classes/build/tools/charsetmapping/SPI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 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
@@ -129,7 +129,7 @@ public static void genClass(String type,
129129
} else if (line.indexOf("_INCLUDE_ALIASES_MAP_") != -1) {
130130
Hasher.genClass(out, aliasKeys, aliasValues,
131131
null, "Aliases", "String",
132-
11, 3, true, false, false);
132+
12, 3, true, false, false);
133133
} else if (line.indexOf("_INCLUDE_CLASSES_MAP_") != -1) {
134134
Hasher.genClass(out, clzKeys, clzValues,
135135
null, "Classes", "String",

‎make/langtools/tools/propertiesparser/parser/MessageType.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2018, 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
@@ -86,13 +86,17 @@ public enum SimpleType implements MessageType {
8686
NAME("name", "Name", "com.sun.tools.javac.util"),
8787
NUMBER("number", "int", null),
8888
OPTION_NAME("option name", "Option", "com.sun.tools.javac.main"),
89+
PROFILE("profile", "Profile", "com.sun.tools.javac.jvm"),
90+
SOURCE("source", "Source", "com.sun.tools.javac.code"),
8991
SOURCE_VERSION("source version", "SourceVersion", "javax.lang.model"),
9092
STRING("string", "String", null),
9193
SYMBOL("symbol", "Symbol", "com.sun.tools.javac.code"),
9294
SYMBOL_KIND("symbol kind", "Kind", "com.sun.tools.javac.code.Kinds"),
9395
KIND_NAME("kind name", "KindName", "com.sun.tools.javac.code.Kinds"),
96+
TARGET("target", "Target", "com.sun.tools.javac.jvm"),
9497
TOKEN("token", "TokenKind", "com.sun.tools.javac.parser.Tokens"),
9598
TYPE("type", "Type", "com.sun.tools.javac.code"),
99+
URL("url", "URL", "java.net"),
96100
SET("set", "Set", "java.util"),
97101
LIST("list", "List", "java.util"),
98102
OBJECT("object", "Object", null),

‎make/launcher/Launcher-jdk.pack.gmk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
8888
CFLAGS_solaris := -KPIC, \
8989
CFLAGS_macosx := -fPIC, \
9090
DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
91-
DISABLED_WARNINGS_microsoft := 4005, \
9291
LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
9392
$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
9493
$(call SET_SHARED_LIBRARY_ORIGIN), \

‎make/lib/Awt2dLibraries.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
224224
format-nonliteral parentheses, \
225225
DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
226226
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
227-
DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
227+
DISABLED_WARNINGS_microsoft := 4297 4244 4267 4291 4302 4311 4996, \
228228
ASFLAGS := $(LIBAWT_ASFLAGS), \
229229
LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
230230
LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \

‎make/lib/Lib-jdk.pack.gmk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
4040
$(LIBJAVA_HEADER_FLAGS), \
4141
CFLAGS_release := -DPRODUCT, \
4242
DISABLED_WARNINGS_gcc := implicit-fallthrough, \
43-
DISABLED_WARNINGS_microsoft := 4005, \
4443
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
4544
$(call SET_SHARED_LIBRARY_ORIGIN), \
4645
LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \

‎src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
#include "gc/g1/g1CardTable.hpp"
3030
#include "gc/g1/g1ThreadLocalData.hpp"
3131
#include "gc/g1/heapRegion.hpp"
32+
#include "gc/shared/collectedHeap.hpp"
33+
#include "runtime/sharedRuntime.hpp"
34+
#include "runtime/thread.hpp"
3235
#include "interpreter/interp_masm.hpp"
3336
#include "runtime/sharedRuntime.hpp"
3437

‎src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, Decorat
4444
}
4545
}
4646

47-
48-
void ModRefBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
49-
Address dst, Register val, Register tmp1, Register tmp2) {
50-
BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
51-
}
52-
5347
void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
5448
Address dst, Register val, Register tmp1, Register tmp2) {
5549
if (type == T_OBJECT || type == T_ARRAY) {

‎src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ModRefBarrierSetAssembler: public BarrierSetAssembler {
4040
Register start, Register end, Register tmp, RegSet saved_regs) {}
4141

4242
virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
43-
Address dst, Register val, Register tmp1, Register tmp2);
43+
Address dst, Register val, Register tmp1, Register tmp2) = 0;
4444

4545
public:
4646
virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,

‎src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,22 +265,21 @@ void InterpreterMacroAssembler::get_method_counters(Register method,
265265

266266
// Load object from cpool->resolved_references(index)
267267
void InterpreterMacroAssembler::load_resolved_reference_at_index(
268-
Register result, Register index) {
268+
Register result, Register index, Register tmp) {
269269
assert_different_registers(result, index);
270270
// convert from field index to resolved_references() index and from
271271
// word index to byte offset. Since this is a java object, it can be compressed
272-
Register tmp = index; // reuse
273-
lslw(tmp, tmp, LogBytesPerHeapOop);
272+
lslw(index, index, LogBytesPerHeapOop);
274273

275274
get_constant_pool(result);
276275
// load pointer for resolved_references[] objArray
277276
ldr(result, Address(result, ConstantPool::cache_offset_in_bytes()));
278277
ldr(result, Address(result, ConstantPoolCache::resolved_references_offset_in_bytes()));
279-
resolve_oop_handle(result);
278+
resolve_oop_handle(result, tmp);
280279
// Add in the index
281-
add(result, result, tmp);
280+
add(result, result, index);
282281
BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
283-
bs->load_at(this, IN_HEAP, T_OBJECT, result, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)), /*tmp1*/ noreg, /*tmp_thread*/ noreg);
282+
bs->load_at(this, IN_HEAP, T_OBJECT, result, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)), tmp, /*tmp_thread*/ noreg);
284283
}
285284

286285
void InterpreterMacroAssembler::load_resolved_klass_at_offset(

‎src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -122,7 +122,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
122122
void get_method_counters(Register method, Register mcs, Label& skip);
123123

124124
// load cpool->resolved_references(index);
125-
void load_resolved_reference_at_index(Register result, Register index);
125+
void load_resolved_reference_at_index(Register result, Register index, Register tmp = r5);
126126

127127
// load cpool->resolved_klass_at(index);
128128
void load_resolved_klass_at_offset(Register cpool, Register index, Register klass, Register temp);

‎src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,7 +2108,7 @@ void MacroAssembler::resolve_jobject(Register value, Register thread, Register t
21082108

21092109
bind(not_weak);
21102110
// Resolve (untagged) jobject.
2111-
bs->load_at(this, IN_ROOT | ON_STRONG_OOP_REF, T_OBJECT,
2111+
bs->load_at(this, IN_ROOT | IN_CONCURRENT_ROOT, T_OBJECT,
21122112
value, Address(value, 0), tmp, thread);
21132113
verify_oop(value);
21142114
bind(done);
@@ -3642,18 +3642,20 @@ void MacroAssembler::load_klass(Register dst, Register src) {
36423642
}
36433643

36443644
// ((OopHandle)result).resolve();
3645-
void MacroAssembler::resolve_oop_handle(Register result) {
3645+
void MacroAssembler::resolve_oop_handle(Register result, Register tmp) {
36463646
// OopHandle::resolve is an indirection.
3647-
ldr(result, Address(result, 0));
3647+
BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
3648+
bs->load_at(this, IN_ROOT | IN_CONCURRENT_ROOT, T_OBJECT,
3649+
result, Address(result, 0), tmp, rthread);
36483650
}
36493651

3650-
void MacroAssembler::load_mirror(Register dst, Register method) {
3652+
void MacroAssembler::load_mirror(Register dst, Register method, Register tmp) {
36513653
const int mirror_offset = in_bytes(Klass::java_mirror_offset());
36523654
ldr(dst, Address(rmethod, Method::const_offset()));
36533655
ldr(dst, Address(dst, ConstMethod::constants_offset()));
36543656
ldr(dst, Address(dst, ConstantPool::pool_holder_offset_in_bytes()));
36553657
ldr(dst, Address(dst, mirror_offset));
3656-
resolve_oop_handle(dst);
3658+
resolve_oop_handle(dst, tmp);
36573659
}
36583660

36593661
void MacroAssembler::cmp_klass(Register oop, Register trial_klass, Register tmp) {

‎src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,8 @@ class MacroAssembler: public Assembler {
803803
void store_klass(Register dst, Register src);
804804
void cmp_klass(Register oop, Register trial_klass, Register tmp);
805805

806-
void resolve_oop_handle(Register result);
807-
void load_mirror(Register dst, Register method);
806+
void resolve_oop_handle(Register result, Register tmp = r5);
807+
void load_mirror(Register dst, Register method, Register tmp = r5);
808808

809809
void load_heap_oop(Register dst, Address src);
810810

0 commit comments

Comments
 (0)