diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a76c9508160..7b06bb6d36d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2010-03-31  Jakub Jelinek  <jakub@redhat.com>
 
+	* var-tracking.c (vt_init_cfa_base): Use cselib_lookup_from_insn
+	instead of cselib_lookup following by tweaking locs->setting_insn.
+
 	PR bootstrap/43596
 	* cselib.c (cselib_process_insn): Clear cselib_current_insn
 	even before returning from label, setjmp call or volatile asm
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 261d47a7cff..55de2092c08 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -8101,10 +8101,10 @@ vt_init_cfa_base (void)
   if (!MAY_HAVE_DEBUG_INSNS)
     return;
 
-  val = cselib_lookup (cfa_base_rtx, GET_MODE (cfa_base_rtx), 1);
+  val = cselib_lookup_from_insn (cfa_base_rtx, GET_MODE (cfa_base_rtx), 1,
+				 get_insns ());
   preserve_value (val);
   cselib_preserve_cfa_base_value (val);
-  val->locs->setting_insn = get_insns ();
   var_reg_decl_set (&VTI (ENTRY_BLOCK_PTR)->out, cfa_base_rtx,
 		    VAR_INIT_STATUS_INITIALIZED, dv_from_value (val->val_rtx),
 		    0, NULL_RTX, INSERT);