From: Bernd Schmidt <bernd.schmidt@analog.com>
Date: Thu, 23 Nov 2006 12:53:15 +0000 (+0000)
Subject: var-tracking.c (emit_note_insn_var_location): Take care not to cause verify_flow_info... 
X-Git-Tag: releases/gcc-4.3.0~8320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49bcb41649de38398633c544833ecdf4169a30f5;p=thirdparty%2Fgcc.git

var-tracking.c (emit_note_insn_var_location): Take care not to cause verify_flow_info failures.

	* var-tracking.c (emit_note_insn_var_location): Take care not to
	cause verify_flow_info failures.

From-SVN: r119116
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b045a0d0ce4a..fbf165210648 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-23  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* var-tracking.c (emit_note_insn_var_location): Take care not to
+	cause verify_flow_info failures.
+
 2006-11-22  Daniel Berlin  <dberlin@dberlin.org>
 
 	* tree-ssa-structalias.c: Remove edge weights in favor of just
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 815facae1820..c4bef66d5e2e 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -2443,7 +2443,9 @@ emit_note_insn_var_location (void **varp, void *data)
     complete = false;
 
   if (where == EMIT_NOTE_AFTER_INSN)
-    note = emit_note_after (NOTE_INSN_VAR_LOCATION, insn);
+    /* emit_note_after can insert a note after a flow-control insn in a basic
+       block.  That causes verify_flow_info failures.  */
+    note = emit_note_before (NOTE_INSN_VAR_LOCATION, NEXT_INSN (insn));
   else
     note = emit_note_before (NOTE_INSN_VAR_LOCATION, insn);