final.c (reemit_insn_block_notes): Do not change scope if insn location is UNKNOWN_LO...

2012-11-05  Dehao Chen  <dehao@google.com>

	* final.c (reemit_insn_block_notes): Do not change scope if insn
	location is UNKNOWN_LOCATION.

From-SVN: r193169

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b8a1082d40cc8d5639db87c5b02a945c3ab3995..d6a0d5694d8b179602bd2e2229651ac84f304001 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-05  Dehao Chen  <dehao@google.com>
+
+       * final.c (reemit_insn_block_notes): Do not change scope if insn
+       location is UNKNOWN_LOCATION.
+
 2012-11-05  Joern Rennecke  <joern.rennecke@embecosm.com>
 
        * doc/md.texi (Defining Attributes): Document that we are defining

diff --git a/gcc/final.c b/gcc/final.c
index 81a679d63fd26e83140637e3550002baf0764fb5..f69963d63350defe0a945d690791d61f3e336a60 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1616,7 +1616,12 @@ reemit_insn_block_notes (void)
                                             insn_scope (XVECEXP (body, 0, i)));
        }
       if (! this_block)
-       this_block = DECL_INITIAL (cfun->decl);
+       {
+         if (INSN_LOCATION (insn) == UNKNOWN_LOCATION)
+           continue;
+         else
+           this_block = DECL_INITIAL (cfun->decl);
+       }
 
       if (this_block != cur_block)
        {