var-tracking.c (emit_note_insn_var_location): Don't call the second…

var-tracking.c (emit_note_insn_var_location): Don't call the second vt_expand_loc unnecessarily when...

	* var-tracking.c (emit_note_insn_var_location): Don't call the second
	vt_expand_loc unnecessarily when location is not a register nor
	memory.

From-SVN: r153666

gcc/ChangeLog

+2009-10-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* var-tracking.c (emit_note_insn_var_location): Don't call the second
+	vt_expand_loc unnecessarily when location is not a register nor
+	memory.
+
 2009-10-28  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* var-tracking.c (emit_note_insn_var_location): Get the mode of

gcc/var-tracking.c

@@ -6428,6 +6428,7 @@ emit_note_insn_var_location (void **varp, void *data)
       if (j < var->n_var_parts
 	  && wider_mode != VOIDmode
 	  && mode == GET_MODE (var->var_part[j].loc_chain->loc)
+	  && (REG_P (loc[n_var_parts]) || MEM_P (loc[n_var_parts]))
 	  && (loc2 = vt_expand_loc (var->var_part[j].loc_chain->loc, vars))
 	  && GET_CODE (loc[n_var_parts]) == GET_CODE (loc2)
 	  && last_limit == var->var_part[j].offset)