Turn check into assertion

hpi-swa · Dec 26, 2023 · d9c4838 · d9c4838 · TruffleSqueak-Bot · Dec 26, 2023
1 parent 9dbb4c3
commit d9c4838
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/....hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/ExecuteTopLevelContextNode.java b/....hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/ExecuteTopLevelContextNode.java
@@ -129,7 +129,8 @@ private ContextObject commonNLReturn(final AbstractSqueakObject sender, final Co
             assert sender == NilObject.SINGLETON;
             throw returnToTopLevel(targetContext, returnValue);
         }
-        if (!targetContext.hasClosure() && !senderContext.canBeReturnedTo()) {
+        if (!senderContext.canBeReturnedTo()) {
+            assert !targetContext.hasClosure();
             return sendCannotReturn(senderContext, returnValue);
         }
         ContextObject context = senderContext;
@@ -150,10 +151,11 @@ private ContextObject commonNLReturn(final AbstractSqueakObject sender, final Co
     @TruffleBoundary
     private ContextObject commonReturn(final ContextObject startContext, final ContextObject targetContext, final Object returnValue) {
         /* "make sure we can return to the given context" */
-        if (!targetContext.hasClosure() && !targetContext.canBeReturnedTo()) {
+        if (!targetContext.canBeReturnedTo()) {
             if (startContext == targetContext) {
                 throw returnToTopLevel(targetContext, returnValue);
             }
+            assert !targetContext.hasClosure();
             return sendCannotReturn(startContext, returnValue);
         }
         /*