Skip to content

Commit 50fc6a0

Browse files
committed
[GR-67249] Address many simple Truffle warnings
1 parent 7104b05 commit 50fc6a0

File tree

66 files changed

+166
-125
lines changed

Some content is hidden

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

66 files changed

+166
-125
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2111,7 +2111,7 @@ static Object sumLongIterator(VirtualFrame frame, Node inliningTarget, PLongSequ
21112111

21122112
@Specialization(guards = "isDouble(start) || isInt(start)")
21132113
static Object sumDoubleIterator(Node inliningTarget, PDoubleSequenceIterator iterator, Object start,
2114-
@Cached InlinedConditionProfile startIsDouble,
2114+
@Cached @Exclusive InlinedConditionProfile startIsDouble,
21152115
@Shared @Cached InlinedLoopConditionProfile loopProfilePrimitive) {
21162116
/*
21172117
* Need to make sure we keep start type if the iterator was empty

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@ static long[] bothSpecified(VirtualFrame frame, Object times, Object ns,
20432043
@SuppressWarnings("unused")
20442044
static long[] timesNotATuple(VirtualFrame frame, Object times, PNone ns,
20452045
@Bind Node inliningTarget,
2046-
@Cached PRaiseNode raiseNode) {
2046+
@Exclusive @Cached PRaiseNode raiseNode) {
20472047
throw timesTupleError(inliningTarget, raiseNode);
20482048
}
20492049

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ abstract static class PyDict_Merge extends CApiTernaryBuiltinNode {
525525
static int merge(PDict a, Object b, @SuppressWarnings("unused") int override,
526526
@Bind Node inliningTarget,
527527
@Shared @Cached PyObjectGetAttr getKeys,
528-
@Cached PyObjectGetAttr getUpdate,
528+
@Exclusive @Cached PyObjectGetAttr getUpdate,
529529
@Shared @Cached CallNode callNode,
530530
@Cached PRaiseNode raiseNode) {
531531
// lookup "keys" to raise the right error:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ abstract static class _PyErr_GetHandledException extends CApiUnaryBuiltinNode {
311311

312312
@Specialization
313313
static Object get(@SuppressWarnings("unused") Object threadState,
314-
@Bind("this") Node inliningTarget,
314+
@Bind Node inliningTarget,
315315
@Cached GetCaughtExceptionNode getCaughtExceptionNode,
316316
@Cached GetEscapedExceptionNode getEscapedExceptionNode) {
317317
AbstractTruffleException caughtException = getCaughtExceptionNode.executeFromNative();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/csv/CSVWriterBuiltins.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import com.oracle.graal.python.runtime.exception.PException;
7272
import com.oracle.truffle.api.dsl.Bind;
7373
import com.oracle.truffle.api.dsl.Cached;
74+
import com.oracle.truffle.api.dsl.GenerateInline;
7475
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
7576
import com.oracle.truffle.api.dsl.NodeFactory;
7677
import com.oracle.truffle.api.dsl.Specialization;
@@ -207,6 +208,7 @@ static void joinAppend(Node inliningTarget, TruffleStringBuilder sb, CSVWriter s
207208

208209
}
209210

211+
@GenerateInline(false) // 36 -> 17
210212
protected abstract static class JoinAppendData extends Node {
211213

212214
abstract boolean execute(Node inliningTarget, TruffleStringBuilder sb, CSVDialect dialect, TruffleString field, boolean quoted, boolean copyPhase,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/StructureBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected abstract static class InitNode extends PythonVarargsBuiltinNode {
133133
@Specialization
134134
static Object Struct_init(VirtualFrame frame, CDataObject self, Object[] args, PKeyword[] kwds,
135135
@Bind Node inliningTarget,
136-
@Cached("createFor(this)") com.oracle.graal.python.runtime.IndirectCallData indirectCallData,
136+
@Cached("createFor($node)") com.oracle.graal.python.runtime.IndirectCallData indirectCallData,
137137
@Cached PyObjectSetAttr setAttr,
138138
@Cached GetClassNode getClassNode,
139139
@Cached PyObjectGetItem getItemNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/functools/PartialBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static Object createFromPartialWoDictWoKw(Object cls, Object[] args, PKeyword[]
179179
@Exclusive @Cached InlinedConditionProfile hasKeywordsProfile,
180180
@Exclusive @SuppressWarnings("unused") @Cached HashingStorageLen lenNode,
181181
@Bind PythonLanguage language,
182-
@Cached TypeNodes.GetInstanceShape getInstanceShape) {
182+
@Shared @Cached TypeNodes.GetInstanceShape getInstanceShape) {
183183
assert args[0] instanceof PPartial;
184184
final PPartial function = (PPartial) args[0];
185185
Object[] funcArgs = getNewPartialArgs(function, args, inliningTarget, hasArgsProfile, 1);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ static void setitem(PArray self, PSlice slice, Object other,
797797
@Shared @Cached DeleteArraySliceNode deleteSliceNode,
798798
@Cached ArrayNodes.ShiftNode shiftNode,
799799
@Cached ArrayNodes.SetLengthNode setLengthNode,
800-
@Cached PRaiseNode raiseNode) {
800+
@Exclusive @Cached PRaiseNode raiseNode) {
801801
int length = self.getLength();
802802
PSlice.SliceInfo sliceInfo = adjustIndices.execute(inliningTarget, length, sliceUnpack.execute(inliningTarget, slice));
803803
int start = sliceInfo.start;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/GetAwaitableNode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.oracle.truffle.api.dsl.Cached;
5555
import com.oracle.truffle.api.dsl.Cached.Exclusive;
5656
import com.oracle.truffle.api.dsl.Fallback;
57+
import com.oracle.truffle.api.dsl.GenerateInline;
5758
import com.oracle.truffle.api.dsl.GenerateUncached;
5859
import com.oracle.truffle.api.dsl.NeverDefault;
5960
import com.oracle.truffle.api.dsl.Specialization;
@@ -62,7 +63,7 @@
6263

6364
@GenerateUncached
6465
@OperationProxy.Proxyable
65-
@SuppressWarnings("truffle-inlining")
66+
@GenerateInline(false)
6667
public abstract class GetAwaitableNode extends Node {
6768
public abstract Object execute(VirtualFrame frame, Object arg);
6869

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static void set(VirtualFrame frame, PByteArray self, Object indexObj, Object val
256256
@Cached PyNumberAsSizeNode asSizeNode,
257257
@Cached("forBytearray()") NormalizeIndexNode normalizeIndexNode,
258258
@Cached SequenceStorageNodes.SetItemScalarNode setItemNode,
259-
@Cached PRaiseNode raiseNode) {
259+
@Cached @Exclusive PRaiseNode raiseNode) {
260260
if (indexCheckNode.execute(inliningTarget, indexObj)) {
261261
int index = asSizeNode.executeExact(frame, inliningTarget, indexObj);
262262
index = normalizeIndexNode.execute(index, self.getSequenceStorage().length());
@@ -329,7 +329,7 @@ static void doSliceGeneric(VirtualFrame frame, PByteArray self, PSlice slice, Ob
329329
static void doDelete(VirtualFrame frame, PByteArray self, Object key, @SuppressWarnings("unused") Object value,
330330
@Bind Node inliningTarget,
331331
@Cached SequenceStorageNodes.DeleteNode deleteNode,
332-
@Cached PRaiseNode raiseNode) {
332+
@Exclusive @Cached PRaiseNode raiseNode) {
333333
self.checkCanResize(inliningTarget, raiseNode);
334334
deleteNode.execute(frame, self.getSequenceStorage(), key);
335335
}

0 commit comments

Comments
 (0)