From: Tom de Vries <tom@codesourcery.com>
Date: Tue, 29 Oct 2013 09:13:12 +0000 (+0000)
Subject: Revert r204121 (Fix line number data for PIC register setup code)
X-Git-Tag: releases/gcc-4.7.4~426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c2ccb40b8484b51541159d5c80b8356de91d21d;p=thirdparty%2Fgcc.git

Revert r204121 (Fix line number data for PIC register setup code)

From-SVN: r204151
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 061a70e7c066..e329845c3487 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,11 @@
 	* cfgexpand.c (gimple_expand_cfg): Remove test for parm_birth_insn.
 	Don't commit insertions after NOTE_INSN_FUNCTION_BEG.
 
+2013-10-28  Tom de Vries  <tom@codesourcery.com>
+
+	* cfgexpand.c (gimple_expand_cfg): Remove test for parm_birth_insn.
+	Don't commit insertions after NOTE_INSN_FUNCTION_BEG.
+
 2013-10-26  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backport from mainline
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 832d40a854c0..10bacda2c830 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -4619,18 +4619,14 @@ gimple_expand_cfg (void)
 	  if (e->insns.r)
 	    {
 	      rebuild_jump_labels_chain (e->insns.r);
-	      /* Put insns after parm birth, but before
-		 NOTE_INSNS_FUNCTION_BEG.  */
+	      /* Avoid putting insns before parm_birth_insn.  */
 	      if (e->src == ENTRY_BLOCK_PTR
-		  && single_succ_p (ENTRY_BLOCK_PTR))
+		  && single_succ_p (ENTRY_BLOCK_PTR)
+		  && parm_birth_insn)
 		{
 		  rtx insns = e->insns.r;
 		  e->insns.r = NULL_RTX;
-		  if (NOTE_P (parm_birth_insn)
-		      && NOTE_KIND (parm_birth_insn) == NOTE_INSN_FUNCTION_BEG)
-		    emit_insn_before_noloc (insns, parm_birth_insn, e->dest);
-		  else
-		    emit_insn_after_noloc (insns, parm_birth_insn, e->dest);
+		  emit_insn_after_noloc (insns, parm_birth_insn, e->dest);
 		}
 	      else
 		commit_one_edge_insertion (e);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f3a6a238fbfe..076c34129a5a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,6 +2,10 @@
 
 	* gcc.target/arm/require-pic-register-loc.c: New test.
 
+2013-10-28  Tom de Vries  <tom@codesourcery.com>
+
+	* gcc.target/arm/require-pic-register-loc.c: New test.
+
 2013-10-26  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gcc.target/arm/require-pic-register-loc.c b/gcc/testsuite/gcc.target/arm/require-pic-register-loc.c
deleted file mode 100644
index bd85e8640c24..000000000000
--- a/gcc/testsuite/gcc.target/arm/require-pic-register-loc.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-g -fPIC" } */
-
-void *v;
-void a (void *x) { }
-void b (void) { }
-                       /* line 7.  */
-int                    /* line 8.  */
-main (int argc)        /* line 9.  */
-{                      /* line 10.  */
-  if (argc == 12345)   /* line 11.  */
-    {
-      a (v);
-      return 1;
-    }
-  b ();
-
-  return 0;
-}
-
-/* { dg-final { scan-assembler-not "\.loc 1 7 0" } } */
-/* { dg-final { scan-assembler-not "\.loc 1 8 0" } } */
-/* { dg-final { scan-assembler-not "\.loc 1 9 0" } } */
-
-/* The loc at the start of the prologue.  */
-/* { dg-final { scan-assembler-times "\.loc 1 10 0" 1 } } */
-
-/* The loc at the end of the prologue, with the first user line.  */
-/* { dg-final { scan-assembler-times "\.loc 1 11 0" 1 } } */