Skip to content

Commit 5dcc4f2

Browse files
zakkakzakkak
authored
Merge pull request #344 from zakkak/merge-with-upstream-21.3.1
Merge upstream 21.3.1
2 parents d7325f0 + fef19e9 commit 5dcc4f2

File tree

260 files changed

+5511
-5025
lines changed

Some content is hidden

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

260 files changed

+5511
-5025
lines changed

‎.github/workflows/mandrel.yml

+32-18
Original file line numberDiff line numberDiff line change
@@ -32,110 +32,124 @@ jobs:
3232
uses: graalvm/mandrel/.github/workflows/base.yml@default
3333
with:
3434
quarkus-version: "2.2"
35-
version: "mandrel/21.3"
35+
repo: ${{ github.repository }}
36+
version: ${{ github.ref }}
3637
mandrel-packaging-version: "21.3"
3738
jdk: "11/ea"
3839
q-2_2-ea-win:
3940
name: "Q 2.2 M 21.3 windows EA"
4041
uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
4142
with:
4243
quarkus-version: "2.2"
43-
version: "mandrel/21.3"
44+
repo: ${{ github.repository }}
45+
version: ${{ github.ref }}
4446
mandrel-packaging-version: "21.3"
4547
jdk: "11/ea"
4648
q-main-ea:
4749
name: "Q main M 21.3 EA"
4850
uses: graalvm/mandrel/.github/workflows/base.yml@default
4951
with:
5052
quarkus-version: "main"
51-
version: "mandrel/21.3"
53+
repo: ${{ github.repository }}
54+
version: ${{ github.ref }}
5255
mandrel-packaging-version: "21.3"
5356
jdk: "11/ea"
5457
q-main-ea-win:
5558
name: "Q main M 21.3 windows EA"
5659
uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
5760
with:
5861
quarkus-version: "main"
59-
version: "mandrel/21.3"
62+
repo: ${{ github.repository }}
63+
version: ${{ github.ref }}
6064
mandrel-packaging-version: "21.3"
6165
jdk: "11/ea"
6266
q-latest-ea:
6367
name: "Q latest M 21.3 EA"
6468
uses: graalvm/mandrel/.github/workflows/base.yml@default
6569
with:
6670
quarkus-version: "latest"
67-
version: "mandrel/21.3"
71+
repo: ${{ github.repository }}
72+
version: ${{ github.ref }}
6873
mandrel-packaging-version: "21.3"
6974
jdk: "11/ea"
7075
q-latest-ea-win:
7176
name: "Q latest M 21.3 windows EA"
7277
uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
7378
with:
7479
quarkus-version: "latest"
75-
version: "mandrel/21.3"
80+
repo: ${{ github.repository }}
81+
version: ${{ github.ref }}
7682
mandrel-packaging-version: "21.3"
7783
jdk: "11/ea"
78-
q-main-ea:
79-
name: "Q main M 21.3 EA"
84+
q-main-17-ea:
85+
name: "Q main M 17 21.3 EA"
8086
uses: graalvm/mandrel/.github/workflows/base.yml@default
8187
with:
8288
quarkus-version: "main"
83-
version: "mandrel/21.3"
89+
repo: ${{ github.repository }}
90+
version: ${{ github.ref }}
8491
mandrel-packaging-version: "21.3"
8592
jdk: "17/ea"
86-
q-main-ea-win:
87-
name: "Q main M 21.3 windows EA"
93+
q-main-17-ea-win:
94+
name: "Q main M 17 21.3 windows EA"
8895
uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
8996
with:
9097
quarkus-version: "main"
91-
version: "mandrel/21.3"
98+
repo: ${{ github.repository }}
99+
version: ${{ github.ref }}
92100
mandrel-packaging-version: "21.3"
93101
jdk: "17/ea"
94102
# q-2_2-ga:
95103
# name: "Q 2.2 M 21.3"
96104
# uses: graalvm/mandrel/.github/workflows/base.yml@default
97105
# with:
98106
# quarkus-version: "2.2"
99-
# version: "mandrel/21.3"
107+
# repo: ${{ github.repository }}
108+
# version: ${{ github.ref }}
100109
# mandrel-packaging-version: "21.3"
101110
# jdk: "11/ga"
102111
# q-2_2-ga-win:
103112
# name: "Q 2.2 M 21.3 windows"
104113
# uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
105114
# with:
106115
# quarkus-version: "2.2"
107-
# version: "mandrel/21.3"
116+
# repo: ${{ github.repository }}
117+
# version: ${{ github.ref }}
108118
# mandrel-packaging-version: "21.3"
109119
# jdk: "11/ga"
110120
# q-main-ga:
111121
# name: "Q main M 21.3"
112122
# uses: graalvm/mandrel/.github/workflows/base.yml@default
113123
# with:
114124
# quarkus-version: "main"
115-
# version: "mandrel/21.3"
125+
# repo: ${{ github.repository }}
126+
# version: ${{ github.ref }}
116127
# mandrel-packaging-version: "21.3"
117128
# jdk: "11/ga"
118129
# q-main-ga-win:
119130
# name: "Q main M 21.3 windows"
120131
# uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
121132
# with:
122133
# quarkus-version: "main"
123-
# version: "mandrel/21.3"
134+
# repo: ${{ github.repository }}
135+
# version: ${{ github.ref }}
124136
# mandrel-packaging-version: "21.3"
125137
# jdk: "11/ga"
126138
# q-latest-ga:
127139
# name: "Q latest M 21.3"
128140
# uses: graalvm/mandrel/.github/workflows/base.yml@default
129141
# with:
130142
# quarkus-version: "latest"
131-
# version: "mandrel/21.3"
143+
# repo: ${{ github.repository }}
144+
# version: ${{ github.ref }}
132145
# mandrel-packaging-version: "21.3"
133146
# jdk: "11/ga"
134147
# q-latest-ga-win:
135148
# name: "Q latest M 21.3 windows"
136149
# uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
137150
# with:
138151
# quarkus-version: "latest"
139-
# version: "mandrel/21.3"
152+
# repo: ${{ github.repository }}
153+
# version: ${{ github.ref }}
140154
# mandrel-packaging-version: "21.3"
141155
# jdk: "11/ga"

‎common.hocon

+2-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ svm-common: ${mx} {
121121
svm-common-linux-amd64: ${svm-common} ${linux-amd64} {
122122
packages: {
123123
devtoolset: "==7" # GCC 7.3.1, make 4.2.1, binutils 2.28, valgrind 3.13.0
124-
binutils: ">=2.34"
124+
binutils: "==2.34"
125125
ruby: ">=2.1.0"
126126
}
127127
timelimit: "55:00"
@@ -130,6 +130,7 @@ svm-common-linux-amd64: ${svm-common} ${linux-amd64} {
130130
svm-common-linux-aarch64: ${svm-common} ${linux-aarch64} {
131131
packages: {
132132
devtoolset: "==7" # GCC 7.3.1, make 4.2.1, binutils 2.28, valgrind 3.13.0
133+
binutils: "==2.34"
133134
ruby: ">=2.1.0"
134135
}
135136
timelimit: "55:00"

‎common.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33

44
"jdks": {
55
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-21.3-b05", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u311+11-jvmci-21.3-b05", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u311+11-jvmci-21.3-b05-fastdebug", "platformspecific": true },
6+
"oraclejdk8": {"name": "oraclejdk", "version": "8u321+07-jvmci-21.3-b07", "platformspecific": true },
7+
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u321+07-jvmci-21.3-b07-fastdebug", "platformspecific": true },
88

99
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
1010
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.13+7-jvmci-21.3-b05", "platformspecific": true },
12-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.13+10-jvmci-21.3-b05", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.14+8-jvmci-21.3-b07", "platformspecific": true },
12+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.14+8-jvmci-21.3-b07", "platformspecific": true },
1313

1414
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
15-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.1+12-jvmci-21.3-b05", "platformspecific": true },
16-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.1+12-jvmci-21.3-b05-debug", "platformspecific": true },
17-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.1+12-jvmci-21.3-b05", "platformspecific": true },
18-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.1+12-jvmci-21.3-b05-debug", "platformspecific": true }
15+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-21.3-b07", "platformspecific": true },
16+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-21.3-b07-debug", "platformspecific": true },
17+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-21.3-b07", "platformspecific": true },
18+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-21.3-b07-debug", "platformspecific": true }
1919
},
2020

2121
"COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

‎compiler/mx.compiler/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"sourceinprojectwhitelist" : [],
55

66
"groupId" : "org.graalvm.compiler",
7-
"version" : "21.3.0.1",
7+
"version" : "21.3.1.0",
88
"release" : False,
99
"url" : "http://www.graalvm.org/",
1010
"developer" : {

‎compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2022, 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
@@ -153,7 +153,7 @@ protected AArch64Kind getMemoryKind(MemoryAccess access) {
153153
return (AArch64Kind) gen.getLIRKind(((ValueNode) access).stamp(NodeView.DEFAULT)).getPlatformKind();
154154
}
155155

156-
private static boolean isSupportedExtendedAddSubShift(IntegerConvertNode<?, ?> node, int clampedShiftAmt) {
156+
private static boolean isSupportedExtendedAddSubShift(IntegerConvertNode<?> node, int clampedShiftAmt) {
157157
assert clampedShiftAmt >= 0;
158158
if (clampedShiftAmt <= 4) {
159159
switch (node.getInputBits()) {
@@ -315,7 +315,7 @@ private ComplexMatchResult emitExtendedAddSubShift(BinaryNode op, ValueNode x, V
315315
public ComplexMatchResult mergeSignExtendByShiftIntoAddSub(BinaryNode op, LeftShiftNode lshift, ValueNode ext, ValueNode x, ValueNode y) {
316316
assert isNumericInteger(lshift);
317317
int shiftAmt = getClampedShiftAmt(lshift);
318-
if (!isSupportedExtendedAddSubShift((IntegerConvertNode<?, ?>) ext, shiftAmt)) {
318+
if (!isSupportedExtendedAddSubShift((IntegerConvertNode<?>) ext, shiftAmt)) {
319319
return null;
320320
}
321321
ExtendType extType;
@@ -864,7 +864,7 @@ public ComplexMatchResult mergeDowncastIntoAddSub(BinaryNode op, ValueNode x, Va
864864
@MatchRule("(Add=op x (ZeroExtend=ext y))")
865865
@MatchRule("(Sub=op x (ZeroExtend=ext y))")
866866
public ComplexMatchResult mergeSignExtendIntoAddSub(BinaryNode op, UnaryNode ext, ValueNode x, ValueNode y) {
867-
if (!isSupportedExtendedAddSubShift((IntegerConvertNode<?, ?>) ext, 0)) {
867+
if (!isSupportedExtendedAddSubShift((IntegerConvertNode<?>) ext, 0)) {
868868
return null;
869869
}
870870

‎compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java

-11
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,6 @@ public void addObject(T object) {
8989
entry.frequency++;
9090
}
9191

92-
/**
93-
* Returns whether the given object has been previously added to the array.
94-
*/
95-
public boolean contains(T object) {
96-
if (object == null && containsNull) {
97-
return true;
98-
}
99-
Entry<T> entry = map.get(object);
100-
return entry != null;
101-
}
102-
10392
/**
10493
* Returns the index of an object in the array. The object must have been
10594
* {@link #addObject(Object) added} before.

0 commit comments

Comments
 (0)