Fix conflicts

[factor.git] / basis / compiler / tree / propagation / propagation-tests.factor

diff --git a/basis/compiler/tree/propagation/propagation-tests.factor b/basis/compiler/tree/propagation/propagation-tests.factor
index 00d982c2bf6fbce2720f8238b2e4d36dbbf67074..06e68d3e3575278e73f72f85be600befd446f92c 100644 (file)
--- a/basis/compiler/tree/propagation/propagation-tests.factor
+++ b/basis/compiler/tree/propagation/propagation-tests.factor
@@ -815,3 +815,6 @@ M: tuple-with-read-only-slot clone
     [ { byte-array fixnum } declare alien-cell dup [ "OOPS" throw ] unless ] final-classes
     first simple-alien class=
 ] unit-test
+
+! Don't crash if bad literal inputs are passed to unsafe words
+[ f ] [ [ { } 1 fixnum+fast ] final-info first literal?>> ] unit-test