From 8b6989ff6e90cff814d36c025bb2b8285ba1b46e Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Thu, 14 Sep 2017 14:15:22 +0200
Subject: [PATCH] Refined assertion.
---
.../oracle/truffle/r/nodes/function/GetCallerFrameNode.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/GetCallerFrameNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/GetCallerFrameNode.java
index ea961908d8..fde5609e43 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/GetCallerFrameNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/GetCallerFrameNode.java
@@ -61,9 +61,8 @@ public final class GetCallerFrameNode extends RBaseNode {
if (slowPathFrame != null) {
return slowPathFrame;
}
- callerFrameObject = null;
}
- assert callerFrameObject == null;
+ assert callerFrameObject instanceof CallerFrameClosure || callerFrameObject == null;
// S3 method can be dispatched from top-level where there is no caller frame
// Since RArguments does not allow to create arguments with a 'null' caller frame, this
--
GitLab