Skip to content

Commit 87086f0

Browse files
eregoneregon
committed
[GR-67249] Run mx build --warning-as-error in CI to prevent regression on Truffle DSL warnings
PullRequest: graalpython/3912
2 parents 82ef956 + 70b139a commit 87086f0

File tree

11 files changed

+32
-32
lines changed

11 files changed

+32
-32
lines changed

‎ci/graal/ci/ci_common/common.jsonnet

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ common + common.frequencies + {
113113
labsjdk21LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-21-llvm"],
114114
graalvmee21:: self["graalvm-ee-21"],
115115

116+
labsjdk25:: self["labsjdk-" + repo_config.graalvm_edition + "-25"],
117+
labsjdk25Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-25Debug"],
118+
labsjdk25LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-25-llvm"],
119+
116120
labsjdkLatest:: self["labsjdk-" + repo_config.graalvm_edition + "-latest"],
117121
labsjdkLatestDebug:: self["labsjdk-" + repo_config.graalvm_edition + "-latestDebug"],
118122
labsjdkLatestLLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-latest-llvm"],

‎ci/graal/ci/ci_common/galahad-common.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ local utils = import "common-utils.libsonnet";
1111
,
1212
# Return true if this is a gate job.
1313
local is_gate(b) =
14-
std.find("gate", b.targets) != []
14+
std.setInter(["gate", "tier1", "tier2", "tier3"], b.targets) != []
1515
,
16-
local gate_or_postmerge_targets = ["gate", "post-merge", "deploy"],
16+
local gate_or_postmerge_targets = ["gate", "tier1", "tier2", "tier3", "post-merge", "deploy"],
1717
# Return true if this is a gate or post-merge/deployment job.
1818
local is_gate_or_postmerge(b) =
1919
std.setInter(gate_or_postmerge_targets, b.targets) != []

‎ci/graal/ci/ci_common/musl-common.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
musl_dependency:: {
44
downloads+: {
55
MUSL_TOOLCHAIN: {
6-
name: 'toolchain-gcc-10.2.1-musl',
7-
version: '1.2.2',
6+
name: 'toolchain-gcc-10.3.0-zlib-1.2.13-musl',
7+
version: '1.2.5.1',
88
platformspecific: true,
99
},
1010
},

‎ci/graal/common.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+6-570", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7-655", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,21 +45,21 @@
4545

4646
"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-25": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-25Debug": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-25-llvm": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },
48+
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+30", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-25": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-25Debug": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-25-llvm": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
5555

56-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+6", "platformspecific": true, "extrabundles": ["static-libs"]},
57-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01", "platformspecific": true },
58-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01-debug", "platformspecific": true },
59-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01-sulong", "platformspecific": true },
60-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01", "platformspecific": true },
61-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01-debug", "platformspecific": true },
62-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-sulong", "platformspecific": true }
56+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7", "platformspecific": true, "extrabundles": ["static-libs"]},
57+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+7-jvmci-b01", "platformspecific": true },
58+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+7-jvmci-b01-debug", "platformspecific": true },
59+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+7-jvmci-b01-sulong", "platformspecific": true },
60+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+7-jvmci-b01", "platformspecific": true },
61+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+7-jvmci-b01-debug", "platformspecific": true },
62+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+7-jvmci-b01-sulong", "platformspecific": true }
6363
},
6464

6565
"eclipse": {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,15 +408,15 @@ abstract static class GraalPyPrivate_Type_SetBufferProcs extends CApiBinaryBuilt
408408

409409
@Specialization
410410
static Object setBuiltinClassType(PythonBuiltinClassType clazz, Object bufferProcs,
411-
@Bind("this") Node inliningTarget,
411+
@Bind Node inliningTarget,
412412
@Shared @Cached HiddenAttr.WriteNode writeAttrNode) {
413413
writeAttrNode.execute(inliningTarget, PythonContext.get(inliningTarget).lookupType(clazz), AS_BUFFER, bufferProcs);
414414
return PNone.NO_VALUE;
415415
}
416416

417417
@Specialization(guards = "isPythonClass(object)")
418418
static Object set(PythonAbstractObject object, Object bufferProcs,
419-
@Bind("this") Node inliningTarget,
419+
@Bind Node inliningTarget,
420420
@Shared @Cached HiddenAttr.WriteNode writeAttrNode) {
421421
writeAttrNode.execute(inliningTarget, object, AS_BUFFER, bufferProcs);
422422
return PNone.NO_VALUE;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtCommonNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,7 @@ static Object doGeneric(Node inliningTarget, Object callable, NativeCExtSymbol d
13521352
@Shared @CachedLibrary(limit = "3") InteropLibrary lib,
13531353
@Shared @Cached UnwrapForeignPointerNode unwrapForeignPointerNode,
13541354
@Shared @CachedLibrary(limit = "1") SignatureLibrary signatureLib,
1355-
@Cached(inline = false) IndirectCallNode nfiSignatureFactory) {
1355+
@Cached IndirectCallNode nfiSignatureFactory) {
13561356
PythonContext pythonContext = PythonContext.get(inliningTarget);
13571357
if (!lib.isExecutable(callable)) {
13581358
if (!pythonContext.isNativeAccessAllowed()) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/CommonGeneratorBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ abstract static class ResumeGeneratorNode extends Node {
162162

163163
@Specialization(guards = {"!isBytecodeDSLInterpreter()", "sameCallTarget(self.getCurrentCallTarget(), callNode)"}, limit = "getCallSiteInlineCacheMaxDepth()")
164164
static Object cached(VirtualFrame frame, Node inliningTarget, PGenerator self, Object sendValue,
165-
@Cached(parameters = "self.getCurrentCallTarget()", inline = false) DirectCallNode callNode,
165+
@Cached(parameters = "self.getCurrentCallTarget()") DirectCallNode callNode,
166166
@Exclusive @Cached CallDispatchers.SimpleDirectInvokeNode invoke,
167167
@Exclusive @Cached InlinedBranchProfile returnProfile,
168168
@Exclusive @Cached IsBuiltinObjectProfile errorProfile,
@@ -188,7 +188,7 @@ static Object cached(VirtualFrame frame, Node inliningTarget, PGenerator self, O
188188

189189
@Specialization(guards = {"isBytecodeDSLInterpreter()", "sameCallTarget(self.getCurrentCallTarget(), callNode)"}, limit = "getCallSiteInlineCacheMaxDepth()")
190190
static Object cachedBytecodeDSL(VirtualFrame frame, Node inliningTarget, PGenerator self, Object sendValue,
191-
@Cached(parameters = "self.getCurrentCallTarget()", inline = false) DirectCallNode callNode,
191+
@Cached(parameters = "self.getCurrentCallTarget()") DirectCallNode callNode,
192192
@Exclusive @Cached CallDispatchers.SimpleDirectInvokeNode invoke,
193193
@Cached("self.getContinuation() == null") boolean firstCall,
194194
@Exclusive @Cached InlinedBranchProfile returnProfile,

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotVarargs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ abstract static class DispatchVarargsBuiltinFullDirectNode extends Node {
263263
@Specialization
264264
static Object call(VirtualFrame frame, Node inliningTarget, TpSlotVarargsBuiltin<?> slot, Object self, Object[] args, PKeyword[] keywords,
265265
@Cached CreateArgumentsNode createArgumentsNode,
266-
@Cached(value = "createDirectCallNode(slot)", inline = false) DirectCallNode callNode,
266+
@Cached("createDirectCallNode(slot)") DirectCallNode callNode,
267267
@Cached CallDispatchers.SimpleDirectInvokeNode invoke) {
268268
CompilerAsserts.partialEvaluationConstant(slot);
269269
Object[] arguments = createArgumentsNode.execute(inliningTarget, slot.getName(), args, keywords, slot.getSignature(), self, null, slot.getDefaults(), slot.getKwDefaults(), false);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallDispatchers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public static Object executeUncached(RootCallTarget callTarget, Object[] argumen
166166
static Object doDirect(VirtualFrame frame, Node inliningTarget, RootCallTarget callTarget, Object[] arguments,
167167
@Cached InlinedConditionProfile profileIsNullFrame,
168168
@Cached ExecutionContext.CallContext callContext,
169-
@Cached(inline = false) IndirectCallNode callNode) {
169+
@Cached IndirectCallNode callNode) {
170170
if (profileIsNullFrame.profile(inliningTarget, frame == null)) {
171171
PythonContext context = PythonContext.get(inliningTarget);
172172
PythonThreadState threadState = context.getThreadState(context.getLanguage(inliningTarget));

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadCallerFrameNode.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import com.oracle.truffle.api.RootCallTarget;
5454
import com.oracle.truffle.api.Truffle;
5555
import com.oracle.truffle.api.bytecode.ContinuationRootNode;
56-
import com.oracle.truffle.api.dsl.GenerateInline;
5756
import com.oracle.truffle.api.dsl.NeverDefault;
5857
import com.oracle.truffle.api.frame.Frame;
5958
import com.oracle.truffle.api.frame.FrameInstance;
@@ -63,7 +62,6 @@
6362
import com.oracle.truffle.api.nodes.RootNode;
6463
import com.oracle.truffle.api.profiles.ConditionProfile;
6564

66-
@GenerateInline(false) // to avoid truffle inline suggestion warnings
6765
public final class ReadCallerFrameNode extends Node {
6866
public interface FrameSelector {
6967
boolean skip(RootNode rootNode);

0 commit comments

Comments
 (0)