backport: c-typeck.c (same_translation_unit_p): Fix pasto.

	Backport from mainline:
	2004-03-22  Diego Novillo  <dnovillo@redhat.com>

	* c-typeck.c (same_translation_unit_p): Fix pasto.

	* gcc.c-torture/compile/20050105-1.c: New test.

From-SVN: r92977

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a7ba3820c70c38f3a9be38edec54b5b79430ac2..2655868df895e2a00b2f7024343710b3ec2d5464 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-06  Jakub Jelinek  <jakub@redhat.com>
+
+       Backport from mainline:
+       2004-03-22  Diego Novillo  <dnovillo@redhat.com>
+
+       * c-typeck.c (same_translation_unit_p): Fix pasto.
+
 2005-01-02  Roger Sayle  <roger@eyesopen.com>
            Andrew Pinski  <pinskia@physics.uc.edu>
            James E. Wilson  <wilson@specifixinc.com>

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index b4cf22d8631121c78cd5f8ffa9c26843f8e89130..563ab7d49e088d8e3fe005ddb650b6ee434b0822 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -647,7 +647,7 @@ same_translation_unit_p (tree t1, tree t2)
   while (t2 && TREE_CODE (t2) != TRANSLATION_UNIT_DECL)
     switch (TREE_CODE_CLASS (TREE_CODE (t2)))
       {
-      case 'd': t2 = DECL_CONTEXT (t1); break;
+      case 'd': t2 = DECL_CONTEXT (t2); break;
       case 't': t2 = TYPE_CONTEXT (t2); break;
       case 'b': t2 = BLOCK_SUPERCONTEXT (t2); break;
       default: abort ();

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6ec033e5987c8a7a34b118b6a89c11b57022739e..994acaef34a275d8c00ce804a228dfd2057f9237 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc.c-torture/compile/20050105-1.c: New test.
+
 2005-01-02  Andreas Jaeger  <aj@suse.de>
 
        * gcc.dg/pr12092-1.c: Do not run on x86_64.