Merge branch 'master' into global_optimization

[factor.git] / basis / compiler / cfg / iterator / iterator.factor

diff --git a/basis/compiler/cfg/iterator/iterator.factor b/basis/compiler/cfg/iterator/iterator.factor
index a8958733a74f239c2607d09e33060a8b7bd1b034..9daf27451c3575db9af693fa62581970906aff8b 100644 (file)
--- a/basis/compiler/cfg/iterator/iterator.factor
+++ b/basis/compiler/cfg/iterator/iterator.factor
@@ -37,9 +37,9 @@ DEFER: (tail-call?)
 : tail-call? ( -- ? )
     node-stack get [
         rest-slice
-        [ t ] [
-            [ (tail-call?) ]
-            [ first #terminate? not ]
-            bi and
-        ] if-empty
+        [ t ] [ (tail-call?) ] if-empty
     ] all? ;
+
+: terminate-call? ( -- ? )
+    node-stack get peek
+    rest-slice [ f ] [ first #terminate? ] if-empty ;