Skip to content

Commit 7df998a

Browse files
OracleLabsAutomationmarwan-hallaoui
OracleLabsAutomation
authored and
marwan-hallaoui
committed
[GR-50933] Merge in tag jdk-23+5.
PullRequest: labsjdk-ce/51
2 parents 1c1d544 + a2b5dec commit 7df998a

File tree

540 files changed

+15598
-6186
lines changed

Some content is hidden

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

540 files changed

+15598
-6186
lines changed

‎bin/blessed-modifier-order.sh‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
34
# Copyright 2015 Google, Inc. All Rights Reserved.
45
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
56
#
@@ -26,12 +27,17 @@ usage() {
2627
echo "$0 DIR ..."
2728
echo "Modifies in place all the java source files found"
2829
echo "in the given directories so that all java language modifiers"
29-
echo "are in the canonical order given by Modifier#toString()."
30+
echo "are in the canonical order."
3031
echo "Tries to get it right even within javadoc comments,"
3132
echo "and even if the list of modifiers spans 2 lines."
3233
echo
3334
echo "See:"
34-
echo "https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Modifier.html#toString-int-"
35+
echo "https://docs.oracle.com/javase/specs/jls/se21/html/jls-8.html#jls-8.1.1"
36+
echo "https://docs.oracle.com/javase/specs/jls/se21/html/jls-8.html#jls-8.3.1"
37+
echo "https://docs.oracle.com/javase/specs/jls/se21/html/jls-8.html#jls-8.4.3"
38+
echo "https://docs.oracle.com/javase/specs/jls/se21/html/jls-8.html#jls-8.8.3"
39+
echo "https://docs.oracle.com/javase/specs/jls/se21/html/jls-9.html#jls-9.1.1"
40+
echo "https://docs.oracle.com/javase/specs/jls/se21/html/jls-9.html#jls-9.4"
3541
echo
3642
echo "Example:"
3743
echo "$0 jdk/src/java.base jdk/test/java/{util,io,lang}"
@@ -46,7 +52,7 @@ for dir in "${dirs[@]}"; do [[ -d "$dir" ]] || usage; done
4652

4753
declare -ar modifiers=(
4854
public protected private
49-
abstract static final transient
55+
abstract default static final sealed non-sealed transient
5056
volatile synchronized native strictfp
5157
)
5258
declare -r SAVE_IFS="$IFS"

‎ci.jsonnet‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,15 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
246246
# Downstream Graal branch to test against. If you change this value to anything but
247247
# "master", you must create an ol-jira issue to change it back to master once the
248248
# next JVMCI release has been made. Add the issue id as a comment here.
249-
local downstream_branch = "labsjdk/automation-1-8-2024-1624",
249+
# You might want to point this to the merge commit of a Graal PR, i.e., include
250+
# the "_gate" suffix.
251+
local downstream_branch = "labsjdk/automation-1-12-2024-940_gate_0",
250252

251253
local clone_graal(defs) = {
252254
# Checkout the graal-enterprise repo to the "_gate" version of the
253255
# named downstream branch. This ensures the graal-enterprise and
254256
# graal repos will be in sync.
255-
local branch = if downstream_branch == "master" then "master" else downstream_branch + "_gate",
257+
local branch = downstream_branch,
256258

257259
run+: [
258260
["git", "clone", defs.graal_enterprise_url],
@@ -291,7 +293,7 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
291293

292294
CompilerTests(defs, conf, fastdebug):: conf + requireLabsJDK(conf) + clone_graal(defs) + {
293295
name: "test-compiler" + (if fastdebug then "-fastdebug" else "") + conf.name,
294-
timelimit: "1:30:00",
296+
timelimit: "1:45:00",
295297
logs: ["*.log"],
296298
targets: ["gate"],
297299
environment+: {

‎make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2024, 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
@@ -1289,25 +1289,58 @@ private static Map<Locale, String> coverageLevelsMap() throws Exception {
12891289
*/
12901290
private static void generateTZDBShortNamesMap() throws IOException {
12911291
Files.walk(Path.of(tzDataDir), 1, FileVisitOption.FOLLOW_LINKS)
1292-
.filter(p -> p.toFile().isFile())
1292+
.filter(p -> p.toFile().isFile() && !p.endsWith("jdk11_backward"))
12931293
.forEach(p -> {
12941294
try {
12951295
String zone = null;
12961296
String rule = null;
12971297
String format = null;
1298+
boolean inVanguard = false;
1299+
boolean inRearguard = false;
12981300
for (var line : Files.readAllLines(p)) {
1299-
if (line.contains("#STDOFF")) continue;
1301+
// Interpret the line in rearguard mode so that STD/DST
1302+
// correctly handles negative DST cases, such as "GMT/IST"
1303+
// vs. "IST/GMT" case for Europe/Dublin
1304+
if (inVanguard) {
1305+
if (line.startsWith("# Rearguard")) {
1306+
inVanguard = false;
1307+
inRearguard = true;
1308+
}
1309+
continue;
1310+
} else if (line.startsWith("# Vanguard")) {
1311+
inVanguard = true;
1312+
continue;
1313+
}
1314+
if (inRearguard) {
1315+
if (line.startsWith("# End of rearguard")) {
1316+
inRearguard = false;
1317+
continue;
1318+
} else {
1319+
if (line.startsWith("#\t")) {
1320+
line = line.substring(1); // omit #
1321+
}
1322+
}
1323+
}
1324+
if (line.isBlank() || line.matches("^[ \t]*#.*")) {
1325+
// ignore blank/comment lines
1326+
continue;
1327+
}
1328+
// remove comments in-line
13001329
line = line.replaceAll("[ \t]*#.*", "");
13011330

13021331
// Zone line
13031332
if (line.startsWith("Zone")) {
1333+
if (zone != null) {
1334+
tzdbShortNamesMap.put(zone, format + NBSP + rule);
1335+
}
13041336
var zl = line.split("[ \t]+", -1);
13051337
zone = zl[1];
13061338
rule = zl[3];
13071339
format = zl[4];
13081340
} else {
13091341
if (zone != null) {
1310-
if (line.isBlank()) {
1342+
if (line.startsWith("Rule") ||
1343+
line.startsWith("Link")) {
13111344
tzdbShortNamesMap.put(zone, format + NBSP + rule);
13121345
zone = null;
13131346
rule = null;

‎make/test/BuildTestLibNative.gmk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 2024, 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
@@ -45,6 +45,10 @@ BUILD_LIBTEST_OUTPUT_DIR := $(OUTPUTDIR)/support/test/lib/native
4545

4646
BUILD_LIBTEST_IMAGE_DIR := $(TEST_IMAGE_DIR)/lib
4747

48+
ifeq ($(call isTargetOs, windows), false)
49+
BUILD_LIBTEST_LIBRARIES_EXCLUDE += libFileUtils.c
50+
endif
51+
4852
# This evaluation is expensive and should only be done if this target was
4953
# explicitly called.
5054
ifneq ($(filter build-test-lib-native, $(MAKECMDGOALS)), )

‎make/test/JtregNativeHotspot.gmk‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2015, 2024, 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
@@ -857,6 +857,11 @@ else
857857
exeinvoke.c exestack-gap.c exestack-tls.c libAsyncGetCallTraceTest.cpp
858858
endif
859859

860+
ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), false)
861+
BUILD_HOTSPOT_JTREG_EXCLUDE += libTestSVEWithJNI.c
862+
endif
863+
864+
860865
BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
861866

862867
ifeq ($(call isTargetOs, windows), true)

‎src/demo/share/jfc/J2Ddemo/java2d/Intro.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
*
3-
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
66
* modification, are permitted provided that the following conditions
@@ -1716,7 +1716,7 @@ public Contributors(int beg, int end, Surface surf) {
17161716
this.beginning = beg;
17171717
this.ending = end;
17181718
fm = surf.getMetrics(font);
1719-
java.util.Arrays.sort(members);
1719+
Arrays.sort(members);
17201720
cast.add("CONTRIBUTORS");
17211721
cast.add(" ");
17221722
cast.addAll(Arrays.asList(members));

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
33
// Copyright (c) 2014, 2021, Red Hat, Inc. All rights reserved.
44
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
//
@@ -8237,6 +8237,24 @@ instruct popCountL_mem(iRegINoSp dst, memory8 mem, vRegD tmp) %{
82378237
ins_pipe(pipe_class_default);
82388238
%}
82398239

8240+
// ============================================================================
8241+
// VerifyVectorAlignment Instruction
8242+
8243+
instruct verify_vector_alignment(iRegP addr, immL_positive_bitmaskI mask, rFlagsReg cr) %{
8244+
match(Set addr (VerifyVectorAlignment addr mask));
8245+
effect(KILL cr);
8246+
format %{ "verify_vector_alignment $addr $mask \t! verify alignment" %}
8247+
ins_encode %{
8248+
Label Lskip;
8249+
// check if masked bits of addr are zero
8250+
__ tst($addr$$Register, $mask$$constant);
8251+
__ br(Assembler::EQ, Lskip);
8252+
__ stop("verify_vector_alignment found a misaligned vector memory access");
8253+
__ bind(Lskip);
8254+
%}
8255+
ins_pipe(pipe_slow);
8256+
%}
8257+
82408258
// ============================================================================
82418259
// MemBar Instruction
82428260

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -282,7 +282,8 @@ void LIR_Assembler::osr_entry() {
282282
__ bind(L);
283283
}
284284
#endif
285-
__ ldp(r19, r20, Address(OSR_buf, slot_offset));
285+
__ ldr(r19, Address(OSR_buf, slot_offset));
286+
__ ldr(r20, Address(OSR_buf, slot_offset + BytesPerWord));
286287
__ str(r19, frame_map()->address_for_monitor_lock(i));
287288
__ str(r20, frame_map()->address_for_monitor_object(i));
288289
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@
156156
static void verify_deopt_original_pc( CompiledMethod* nm, intptr_t* unextended_sp);
157157
#endif
158158

159-
const ImmutableOopMap* get_oop_map() const;
160-
161159
public:
162160
// Constructors
163161

‎src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2024, 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
*
@@ -195,7 +195,7 @@ inline bool frame::equal(frame other) const {
195195
&& unextended_sp() == other.unextended_sp()
196196
&& fp() == other.fp()
197197
&& pc() == other.pc();
198-
assert(!ret || ret && cb() == other.cb() && _deopt_state == other._deopt_state, "inconsistent construction");
198+
assert(!ret || (cb() == other.cb() && _deopt_state == other._deopt_state), "inconsistent construction");
199199
return ret;
200200
}
201201

@@ -359,20 +359,6 @@ inline int frame::sender_sp_ret_address_offset() {
359359
return frame::sender_sp_offset - frame::return_addr_offset;
360360
}
361361

362-
inline const ImmutableOopMap* frame::get_oop_map() const {
363-
if (_cb == nullptr) return nullptr;
364-
if (_cb->oop_maps() != nullptr) {
365-
NativePostCallNop* nop = nativePostCallNop_at(_pc);
366-
if (nop != nullptr && nop->displacement() != 0) {
367-
int slot = ((nop->displacement() >> 24) & 0xff);
368-
return _cb->oop_map_for_slot(slot, _pc);
369-
}
370-
const ImmutableOopMap* oop_map = OopMapSet::find_map(this);
371-
return oop_map;
372-
}
373-
return nullptr;
374-
}
375-
376362
//------------------------------------------------------------------------------
377363
// frame::sender
378364
inline frame frame::sender(RegisterMap* map) const {

0 commit comments

Comments
 (0)