From e9a4a41ce972729f5e81bc20cb0151374200c6db Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 22 Jun 2016 13:14:03 -0700
Subject: [PATCH] add assert to ENCLOS result
---
.../com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
index 3d2a960d71..901969f1ef 100644
--- a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
+++ b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
@@ -852,8 +852,11 @@ public class CallRFFIHelper {
}
public static Object ENCLOS(Object x) {
+ RFFIUtils.traceUpCall("ENCLOS", x);
REnvironment env = guaranteeInstanceOf(x, REnvironment.class);
- return env.getParent();
+ REnvironment result = env.getParent();
+ assert result != null;
+ return result;
}
@SuppressWarnings("unused")
--
GitLab