Skip to content

Commit 371ac28

Browse files
robehnrobehn
committed
Merge branch 'master' into 8212107-vmthread
2 parents 03a033f + 1f5a033 commit 371ac28

File tree

644 files changed

+6869
-25105
lines changed

Some content is hidden

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

644 files changed

+6869
-25105
lines changed

‎doc/building.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler (Toolchain) Requ
273273
</tr>
274274
<tr class="odd">
275275
<td style="text-align: left;">Windows</td>
276-
<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.5.3</td>
276+
<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.7.2</td>
277277
</tr>
278278
</tbody>
279279
</table>

‎doc/building.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ issues.
304304
------------------ -------------------------------------------------------
305305
Linux gcc 9.2.0
306306
macOS Apple Xcode 10.1 (using clang 10.0.0)
307-
Windows Microsoft Visual Studio 2019 update 16.5.3
307+
Windows Microsoft Visual Studio 2019 update 16.7.2
308308

309309
All compilers are expected to be able to compile to the C99 language standard,
310310
as some C99 features are used in the source code. Microsoft Visual Studio

‎make/autoconf/configure.ac‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ HOTSPOT_SETUP_MISC
242242
#
243243
###############################################################################
244244

245-
JDKOPT_DETECT_INTREE_EC
246245
JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER
247246
JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
248247
JDKOPT_EXCLUDE_TRANSLATIONS

‎make/autoconf/jdk-options.m4‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -228,23 +228,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
228228
])
229229

230230
###############################################################################
231-
#
232-
# Enable or disable the elliptic curve crypto implementation
233-
#
234-
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
235-
[
236-
AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
237-
238-
if test -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
239-
ENABLE_INTREE_EC=true
240-
AC_MSG_RESULT([yes])
241-
else
242-
ENABLE_INTREE_EC=false
243-
AC_MSG_RESULT([no])
244-
fi
245-
246-
AC_SUBST(ENABLE_INTREE_EC)
247-
])
248231

249232
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
250233
[

‎make/autoconf/jvm-features.m4‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,14 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
395395
AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
396396
AVAILABLE=false
397397
fi
398-
elif test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64"; then
399-
AC_MSG_RESULT([yes])
398+
elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
399+
if test "x$OPENJDK_TARGET_OS" = "xlinux" || \
400+
test "x$OPENJDK_TARGET_OS" = "xwindows"; then
401+
AC_MSG_RESULT([yes])
402+
else
403+
AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
404+
AVAILABLE=false
405+
fi
400406
else
401407
AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
402408
AVAILABLE=false

‎make/conf/jib-profiles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ var getJibProfilesDependencies = function (input, common) {
961961
var devkit_platform_revisions = {
962962
linux_x64: "gcc9.2.0-OL6.4+1.0",
963963
macosx_x64: "Xcode11.3.1-MacOSX10.15+1.0",
964-
windows_x64: "VS2019-16.5.3+1.0",
964+
windows_x64: "VS2019-16.7.2+1.0",
965965
linux_aarch64: "gcc9.2.0-OL7.6+1.0",
966966
linux_arm: "gcc8.2.0-Fedora27+1.0",
967967
linux_ppc64le: "gcc8.2.0-Fedora27+1.0",

‎make/hotspot/symbols/symbols-unix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ JVM_GetPermittedSubclasses
123123
JVM_GetPrimitiveArrayElement
124124
JVM_GetProperties
125125
JVM_GetProtectionDomain
126-
JVM_GetRandomSeedForCDSDump
126+
JVM_GetRandomSeedForDumping
127127
JVM_GetRecordComponents
128128
JVM_GetSimpleBinaryName
129129
JVM_GetStackAccessControlContext
@@ -143,8 +143,8 @@ JVM_InternString
143143
JVM_Interrupt
144144
JVM_InvokeMethod
145145
JVM_IsArrayClass
146-
JVM_IsCDSDumpingEnabled
147-
JVM_IsCDSSharingEnabled
146+
JVM_IsDynamicDumpingEnabled
147+
JVM_IsSharingEnabled
148148
JVM_IsConstructorIx
149149
JVM_IsHiddenClass
150150
JVM_IsInterface

‎src/hotspot/cpu/aarch64/aarch64.ad‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -247,71 +247,71 @@ reg_def R31_H ( NS, NS, Op_RegI, 31, r31_sp->as_VMReg()->next());
247247
reg_def V7_N ( SOC, SOC, Op_RegF, 7, v7->as_VMReg()->next(6) );
248248
reg_def V7_O ( SOC, SOC, Op_RegF, 7, v7->as_VMReg()->next(7) );
249249

250-
reg_def V8 ( SOC, SOC, Op_RegF, 8, v8->as_VMReg() );
251-
reg_def V8_H ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next() );
250+
reg_def V8 ( SOC, SOE, Op_RegF, 8, v8->as_VMReg() );
251+
reg_def V8_H ( SOC, SOE, Op_RegF, 8, v8->as_VMReg()->next() );
252252
reg_def V8_J ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(2) );
253253
reg_def V8_K ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(3) );
254254
reg_def V8_L ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(4) );
255255
reg_def V8_M ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(5) );
256256
reg_def V8_N ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(6) );
257257
reg_def V8_O ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(7) );
258258

259-
reg_def V9 ( SOC, SOC, Op_RegF, 9, v9->as_VMReg() );
260-
reg_def V9_H ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next() );
259+
reg_def V9 ( SOC, SOE, Op_RegF, 9, v9->as_VMReg() );
260+
reg_def V9_H ( SOC, SOE, Op_RegF, 9, v9->as_VMReg()->next() );
261261
reg_def V9_J ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(2) );
262262
reg_def V9_K ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(3) );
263263
reg_def V9_L ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(4) );
264264
reg_def V9_M ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(5) );
265265
reg_def V9_N ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(6) );
266266
reg_def V9_O ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(7) );
267267

268-
reg_def V10 ( SOC, SOC, Op_RegF, 10, v10->as_VMReg() );
269-
reg_def V10_H ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next() );
268+
reg_def V10 ( SOC, SOE, Op_RegF, 10, v10->as_VMReg() );
269+
reg_def V10_H ( SOC, SOE, Op_RegF, 10, v10->as_VMReg()->next() );
270270
reg_def V10_J ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(2) );
271271
reg_def V10_K ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(3) );
272272
reg_def V10_L ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(4) );
273273
reg_def V10_M ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(5) );
274274
reg_def V10_N ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(6) );
275275
reg_def V10_O ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(7) );
276276

277-
reg_def V11 ( SOC, SOC, Op_RegF, 11, v11->as_VMReg() );
278-
reg_def V11_H ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next() );
277+
reg_def V11 ( SOC, SOE, Op_RegF, 11, v11->as_VMReg() );
278+
reg_def V11_H ( SOC, SOE, Op_RegF, 11, v11->as_VMReg()->next() );
279279
reg_def V11_J ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(2) );
280280
reg_def V11_K ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(3) );
281281
reg_def V11_L ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(4) );
282282
reg_def V11_M ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(5) );
283283
reg_def V11_N ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(6) );
284284
reg_def V11_O ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(7) );
285285

286-
reg_def V12 ( SOC, SOC, Op_RegF, 12, v12->as_VMReg() );
287-
reg_def V12_H ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next() );
286+
reg_def V12 ( SOC, SOE, Op_RegF, 12, v12->as_VMReg() );
287+
reg_def V12_H ( SOC, SOE, Op_RegF, 12, v12->as_VMReg()->next() );
288288
reg_def V12_J ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(2) );
289289
reg_def V12_K ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(3) );
290290
reg_def V12_L ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(4) );
291291
reg_def V12_M ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(5) );
292292
reg_def V12_N ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(6) );
293293
reg_def V12_O ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(7) );
294294

295-
reg_def V13 ( SOC, SOC, Op_RegF, 13, v13->as_VMReg() );
296-
reg_def V13_H ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next() );
295+
reg_def V13 ( SOC, SOE, Op_RegF, 13, v13->as_VMReg() );
296+
reg_def V13_H ( SOC, SOE, Op_RegF, 13, v13->as_VMReg()->next() );
297297
reg_def V13_J ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(2) );
298298
reg_def V13_K ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(3) );
299299
reg_def V13_L ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(4) );
300300
reg_def V13_M ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(5) );
301301
reg_def V13_N ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(6) );
302302
reg_def V13_O ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(7) );
303303

304-
reg_def V14 ( SOC, SOC, Op_RegF, 14, v14->as_VMReg() );
305-
reg_def V14_H ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next() );
304+
reg_def V14 ( SOC, SOE, Op_RegF, 14, v14->as_VMReg() );
305+
reg_def V14_H ( SOC, SOE, Op_RegF, 14, v14->as_VMReg()->next() );
306306
reg_def V14_J ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(2) );
307307
reg_def V14_K ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(3) );
308308
reg_def V14_L ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(4) );
309309
reg_def V14_M ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(5) );
310310
reg_def V14_N ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(6) );
311311
reg_def V14_O ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(7) );
312312

313-
reg_def V15 ( SOC, SOC, Op_RegF, 15, v15->as_VMReg() );
314-
reg_def V15_H ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next() );
313+
reg_def V15 ( SOC, SOE, Op_RegF, 15, v15->as_VMReg() );
314+
reg_def V15_H ( SOC, SOE, Op_RegF, 15, v15->as_VMReg()->next() );
315315
reg_def V15_J ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(2) );
316316
reg_def V15_K ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(3) );
317317
reg_def V15_L ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(4) );

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,8 @@ class Address {
401401
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
402402
Address(Register r, unsigned long long o)
403403
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
404-
#ifdef ASSERT
405404
Address(Register r, ByteSize disp)
406-
: _base(r), _index(noreg), _offset(in_bytes(disp)), _mode(base_plus_offset), _target(0) { }
407-
#endif
405+
: Address(r, in_bytes(disp)) { }
408406
Address(Register r, Register r1, extend ext = lsl())
409407
: _base(r), _index(r1), _offset(0), _mode(base_plus_offset_reg),
410408
_ext(ext), _target(0) { }

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -80,8 +80,6 @@
8080

8181
void set_last_Java_sp(intptr_t* sp) { _last_Java_sp = sp; OrderAccess::release(); }
8282

83-
intptr_t* last_Java_fp(void) { return _last_Java_fp; }
84-
// Assert (last_Java_sp == NULL || fp == NULL)
85-
void set_last_Java_fp(intptr_t* fp) { OrderAccess::release(); _last_Java_fp = fp; }
83+
intptr_t* last_Java_fp(void) { return _last_Java_fp; }
8684

8785
#endif // CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP

0 commit comments

Comments
 (0)