1 files changed, 16 insertions, 0 deletions
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 3e4ef15..4fc329f 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3304,6 +3304,22 @@ expand_builtin_expect_jump (exp, if_false_label, if_true_label)
       int j;
       int num_jumps = 0;
 
+      /* If we fail to locate an appropriate conditional jump, we'll
+	 fall back to normal evaluation.  Ensure that the expression
+	 can be re-evaluated.  */
+      switch (unsafe_for_reeval (arg0))
+	{
+	case 0: /* Safe.  */
+	  break;
+
+	case 1: /* Mildly unsafe.  */
+	  arg0 = unsave_expr (arg0);
+	  break;
+
+	case 2: /* Wildly unsafe.  */
+	  return NULL_RTX;
+	}
+
       /* Expand the jump insns.  */
       start_sequence ();
       do_jump (arg0, if_false_label, if_true_label);