From 32e24efb2e6c58500e67f2bc3a7b7b42a9c0bce4 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Wed, 11 Oct 2017 11:28:19 +0200
Subject: [PATCH] Fix: Wrong return type for 'Rf_setAttrib'.
---
.../oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java | 4 ++--
.../com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java | 2 +-
.../fficall/src/truffle_common/Rinternals_truffle_common.h | 2 +-
com.oracle.truffle.r.native/version.source | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java
index 061fc37d80..f7852a6969 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java
@@ -310,7 +310,7 @@ public abstract class JavaUpCallsRFFIImpl implements UpCallsRFFI {
@Override
@TruffleBoundary
- public int Rf_setAttrib(Object obj, Object name, Object val) {
+ public Object Rf_setAttrib(Object obj, Object name, Object val) {
if (obj instanceof RAttributable) {
RAttributable attrObj = (RAttributable) obj;
String nameAsString;
@@ -335,7 +335,7 @@ public abstract class JavaUpCallsRFFIImpl implements UpCallsRFFI {
} else {
throw RInternalError.shouldNotReachHere();
}
- return 0;
+ return val;
}
@TruffleBoundary
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java
index 9138e92393..50237121f1 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java
@@ -127,7 +127,7 @@ public interface StdUpCallsRFFI {
Object Rf_getAttrib(Object obj, Object name);
- int /* void */ Rf_setAttrib(Object obj, Object name, Object val);
+ Object Rf_setAttrib(Object obj, Object name, Object val);
int Rf_inherits(Object x, @RFFICstring String clazz);
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h b/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
index cc43c6ff9c..9d45df5e3d 100644
--- a/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
+++ b/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
@@ -158,7 +158,7 @@ void Rf_gsetVar(SEXP symbol, SEXP value, SEXP rho) {
}
SEXP Rf_coerceVector(SEXP x, SEXPTYPE mode) {
- TRACE0();
+ TRACE(TARGpp, x, mode);
SEXP result = ((call_Rf_coerceVector) callbacks[Rf_coerceVector_x])(x, mode);
checkExitCall();
return result;
diff --git a/com.oracle.truffle.r.native/version.source b/com.oracle.truffle.r.native/version.source
index 87523dd7a0..d81cc0710e 100644
--- a/com.oracle.truffle.r.native/version.source
+++ b/com.oracle.truffle.r.native/version.source
@@ -1 +1 @@
-41
+42
--
GitLab