Skip to content

Commit 86be22a

Browse files
committed
Fix sulong DSL warnings/errors (dsl-warnings)
1 parent 977aeef commit 86be22a

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/asm/syscall/LLVMSyscallNode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ protected LLVMSyscallOperationNode createNode(long syscallNum) {
5454
return LLVMLanguage.get(null).getCapability(PlatformCapability.class).createSyscallNode(syscallNum);
5555
}
5656

57+
@SuppressWarnings("truffle-unexpected-result-rewrite")
5758
@Specialization(guards = "syscallNum == cachedSyscallNum", limit = "NUM_SYSCALLS", rewriteOn = UnexpectedResultException.class)
5859
protected long cachedSyscall(@SuppressWarnings("unused") long syscallNum, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6,
5960
@Cached("syscallNum") @SuppressWarnings("unused") long cachedSyscallNum,
@@ -96,6 +97,7 @@ private static String getNodeName(LLVMSyscallOperationNode node) {
9697
return node.getName();
9798
}
9899

100+
@SuppressWarnings("truffle-unexpected-result-rewrite")
99101
@TruffleBoundary
100102
@Specialization(replaces = "cachedSyscallGeneric")
101103
protected Object doGeneric(long syscallNum, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/llvm/x86/LLVMX86_VectorMathNode.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,6 @@ protected static Comparator getComparator(int predicate) {
262262
return Comparator.values()[predicate];
263263
}
264264

265-
@Specialization(guards = {"v1.getLength() == 2", "v2.getLength() == 2"})
266-
protected LLVMDoubleVector doCmpAOT(LLVMDoubleVector v1, LLVMDoubleVector v2, int predicate) {
267-
return compare(v1, v2, getComparator(predicate));
268-
}
269-
270-
@Specialization(guards = {"v1.getLength() == 2", "v2.getLength() == 2"})
271-
protected LLVMDoubleVector doCmpAOT(LLVMDoubleVector v1, LLVMDoubleVector v2, byte predicate) {
272-
return compare(v1, v2, getComparator(predicate));
273-
}
274-
275265
@Specialization(guards = {"v1.getLength() == 2", "v2.getLength() == 2", "predicate == cachedPredicate"}, limit = "cmpCnt")
276266
@GenerateAOT.Exclude
277267
protected LLVMDoubleVector doCmp(LLVMDoubleVector v1, LLVMDoubleVector v2, @SuppressWarnings("unused") int predicate,
@@ -288,6 +278,16 @@ protected LLVMDoubleVector doCmp(LLVMDoubleVector v1, LLVMDoubleVector v2, @Supp
288278
return compare(v1, v2, comparator);
289279
}
290280

281+
@Specialization(guards = {"v1.getLength() == 2", "v2.getLength() == 2"})
282+
protected LLVMDoubleVector doCmpAOT(LLVMDoubleVector v1, LLVMDoubleVector v2, int predicate) {
283+
return compare(v1, v2, getComparator(predicate));
284+
}
285+
286+
@Specialization(guards = {"v1.getLength() == 2", "v2.getLength() == 2"})
287+
protected LLVMDoubleVector doCmpAOT(LLVMDoubleVector v1, LLVMDoubleVector v2, byte predicate) {
288+
return compare(v1, v2, getComparator(predicate));
289+
}
290+
291291
private static LLVMDoubleVector compare(LLVMDoubleVector v1, LLVMDoubleVector v2, Comparator comparator) {
292292
double v11 = v1.getValue(0);
293293
double v21 = v2.getValue(0);

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/memory/load/LLVMI64LoadNode.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,15 @@ protected Object doGenericI64DerefHandle(LLVMNativePointer addr, long offset,
8080
return doGenericI64Managed(getReceiver.execute(addr), offset, nativeRead);
8181
}
8282

83+
@SuppressWarnings("truffle-unexpected-result-rewrite")
8384
@Specialization(limit = "3", rewriteOn = UnexpectedResultException.class)
8485
@GenerateAOT.Exclude
8586
protected long doI64Managed(LLVMManagedPointer addr, long offset,
8687
@CachedLibrary("addr.getObject()") LLVMManagedReadLibrary nativeRead) throws UnexpectedResultException {
8788
return nativeRead.readI64(addr.getObject(), addr.getOffset() + offset);
8889
}
8990

91+
@SuppressWarnings("truffle-unexpected-result-rewrite")
9092
@Specialization(limit = "3", replaces = "doI64Managed")
9193
@GenerateAOT.Exclude
9294
protected Object doGenericI64Managed(LLVMManagedPointer addr, long offset,
@@ -114,13 +116,15 @@ protected Object doGenericI64DerefHandle(LLVMNativePointer addr,
114116
return doGenericI64Managed(getReceiver.execute(addr), nativeRead);
115117
}
116118

119+
@SuppressWarnings("truffle-unexpected-result-rewrite")
117120
@Specialization(limit = "3", rewriteOn = UnexpectedResultException.class)
118121
@GenerateAOT.Exclude
119122
protected long doI64Managed(LLVMManagedPointer addr,
120123
@CachedLibrary("addr.getObject()") LLVMManagedReadLibrary nativeRead) throws UnexpectedResultException {
121124
return nativeRead.readI64(addr.getObject(), addr.getOffset());
122125
}
123126

127+
@SuppressWarnings("truffle-unexpected-result-rewrite")
124128
@Specialization(limit = "3", replaces = "doI64Managed")
125129
@GenerateAOT.Exclude
126130
protected Object doGenericI64Managed(LLVMManagedPointer addr,

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/memory/load/LLVMLoadVectorNode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ protected LLVMVector doI64VectorDerefHandle(LLVMNativePointer addr,
313313
return load.executeWithTarget(getReceiver.execute(addr));
314314
}
315315

316+
@SuppressWarnings("truffle-unexpected-result-rewrite")
316317
@Specialization(limit = "3", rewriteOn = UnexpectedResultException.class)
317318
@ExplodeLoop
318319
protected LLVMI64Vector doI64Vector(LLVMManagedPointer addr,
@@ -351,6 +352,7 @@ protected LLVMI64Vector doI64Vector(LLVMManagedPointer addr,
351352
}
352353
}
353354

355+
@SuppressWarnings("truffle-unexpected-result-rewrite")
354356
@Specialization(replaces = "doI64Vector")
355357
@ExplodeLoop
356358
protected LLVMPointerVector doPointerVector(LLVMManagedPointer addr,

0 commit comments

Comments
 (0)