From 7f5aa15376752ee5c6206dc453bbfb5a245b0841 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Tue, 18 Jul 2017 11:40:23 +0200
Subject: [PATCH] minor cleanups
---
.../r/ffi/impl/interop/pcre/CaptureNamesResultMR.java | 5 +----
.../src/com/oracle/truffle/r/ffi/processor/FFIProcessor.java | 2 +-
.../src/com/oracle/truffle/r/runtime/ffi/DLL.java | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/interop/pcre/CaptureNamesResultMR.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/interop/pcre/CaptureNamesResultMR.java
index c57a4ef1c2..b836331256 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/interop/pcre/CaptureNamesResultMR.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/interop/pcre/CaptureNamesResultMR.java
@@ -22,7 +22,6 @@
*/
package com.oracle.truffle.r.ffi.impl.interop.pcre;
-import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.interop.CanResolve;
import com.oracle.truffle.api.interop.ForeignAccess;
import com.oracle.truffle.api.interop.InteropException;
@@ -31,7 +30,6 @@ import com.oracle.truffle.api.interop.MessageResolution;
import com.oracle.truffle.api.interop.Resolve;
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.Node.Child;
import com.oracle.truffle.r.runtime.RInternalError;
@MessageResolution(receiverType = CaptureNamesResult.class)
@@ -57,7 +55,7 @@ public class CaptureNamesResultMR {
@Child private Node isNullNode = Message.IS_NULL.createNode();
@Child private Node unboxNode = Message.UNBOX.createNode();
- protected Object access(@SuppressWarnings("unused") VirtualFrame frame, CaptureNamesResult receiver, Object[] arguments) {
+ protected Object access(CaptureNamesResult receiver, Object[] arguments) {
try {
Object arg1 = arguments[1];
if (arg1 instanceof TruffleObject) {
@@ -74,5 +72,4 @@ public class CaptureNamesResultMR {
}
}
}
-
}
diff --git a/com.oracle.truffle.r.ffi.processor/src/com/oracle/truffle/r/ffi/processor/FFIProcessor.java b/com.oracle.truffle.r.ffi.processor/src/com/oracle/truffle/r/ffi/processor/FFIProcessor.java
index ed6a6b96dd..19f8132512 100644
--- a/com.oracle.truffle.r.ffi.processor/src/com/oracle/truffle/r/ffi/processor/FFIProcessor.java
+++ b/com.oracle.truffle.r.ffi.processor/src/com/oracle/truffle/r/ffi/processor/FFIProcessor.java
@@ -87,7 +87,7 @@ public final class FFIProcessor extends AbstractProcessor {
private void processElement(Element e) throws IOException {
if (e.getKind() != ElementKind.INTERFACE) {
- processingEnv.getMessager().printMessage(Kind.ERROR, "RFFIUpCallRoot mjusty annotate an interface");
+ processingEnv.getMessager().printMessage(Kind.ERROR, "RFFIUpCallRoot must annotate an interface");
}
Types types = processingEnv.getTypeUtils();
TypeElement typeElement = (TypeElement) e;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
index f690726257..dc7345c26e 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
@@ -374,7 +374,7 @@ public class DLL {
if (value instanceof TruffleObject) {
return (TruffleObject) value;
} else {
- throw RInternalError.shouldNotReachHere();
+ throw RInternalError.shouldNotReachHere("value: " + value);
}
}
}
--
GitLab