var-tracking.c (vt_expand_loc_callback): Don't run cselib_expand_value_rtx_cb in dummy mode if...

	* var-tracking.c (vt_expand_loc_callback): Don't run
	cselib_expand_value_rtx_cb in dummy mode if
	cselib_dummy_expand_value_rtx_cb returned false.

From-SVN: r157764

gcc/ChangeLog

 2010-03-26  Jakub Jelinek  <jakub@redhat.com>
 
+	* var-tracking.c (vt_expand_loc_callback): Don't run
+	cselib_expand_value_rtx_cb in dummy mode if
+	cselib_dummy_expand_value_rtx_cb returned false.
+
 	* var-tracking.c (emit_note_insn_var_location): For one part
 	notes with offset 0, don't add EXPR_LIST around the location.
 	* dwarf2out.c (loc_descriptor, dw_loc_list_1,

gcc/var-tracking.c

@@ -6860,14 +6860,13 @@ vt_expand_loc_callback (rtx x, bitmap regs, int max_depth, void *data)
 		result = pc_rtx;
 		break;
 	      }
-	    else
-	      {
-		result = cselib_expand_value_rtx_cb (loc->loc, regs, max_depth,
-						     vt_expand_loc_callback,
-						     data);
-		if (result)
-		  break;
-	      }
+	  }
+	else
+	  {
+	    result = cselib_expand_value_rtx_cb (loc->loc, regs, max_depth,
+						 vt_expand_loc_callback, data);
+	    if (result)
+	      break;
 	  }
       if (dummy && (result || var->var_part[0].cur_loc))
 	var->cur_loc_changed = true;