From: davem <davem@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 12 Jun 2002 06:14:03 +0000 (+0000)
Subject: 2002-06-11  David S. Miller  <davem@redhat.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59d19cb8e03ac6611627fdde7f15f77140b52c1d;p=thirdparty%2Fgcc.git

2002-06-11  David S. Miller  <davem@redhat.com>

	* emit-rtl.c (emit_*_scope): Only access INSN_SCOPE if
	active_insn_p.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54545 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85306407035e..4776742b308c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-11  David S. Miller  <davem@redhat.com>
+
+	* emit-rtl.c (emit_*_scope): Only access INSN_SCOPE if
+	active_insn_p.
+
 2002-06-11  Richard Henderson  <rth@redhat.com>
 
 	* c-common.c (builtin_define_type_max): New.
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 2af1bae86cf2..27a511f03310 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4298,7 +4298,8 @@ emit_insn_after_scope (pattern, after, scope)
   after = NEXT_INSN (after);
   while (1)
     {
-      INSN_SCOPE (after) = scope;
+      if (active_insn_p (after))
+	INSN_SCOPE (after) = scope;
       if (after == last)
 	break;
       after = NEXT_INSN (after);
@@ -4317,7 +4318,8 @@ emit_jump_insn_after_scope (pattern, after, scope)
   after = NEXT_INSN (after);
   while (1)
     {
-      INSN_SCOPE (after) = scope;
+      if (active_insn_p (after))
+	INSN_SCOPE (after) = scope;
       if (after == last)
 	break;
       after = NEXT_INSN (after);
@@ -4336,7 +4338,8 @@ emit_call_insn_after_scope (pattern, after, scope)
   after = NEXT_INSN (after);
   while (1)
     {
-      INSN_SCOPE (after) = scope;
+      if (active_insn_p (after))
+	INSN_SCOPE (after) = scope;
       if (after == last)
 	break;
       after = NEXT_INSN (after);
@@ -4356,7 +4359,8 @@ emit_insn_before_scope (pattern, before, scope)
   first = NEXT_INSN (first);
   while (1)
     {
-      INSN_SCOPE (first) = scope;
+      if (active_insn_p (first))
+	INSN_SCOPE (first) = scope;
       if (first == last)
 	break;
       first = NEXT_INSN (first);