From: Nathan Sidwell <nathan@codesourcery.com>
Date: Fri, 15 Aug 2003 10:23:46 +0000 (+0000)
Subject: decl.c (make_typename_type): Use my_friendly_assert.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4f7847cab9999f228bd0ebf17dda3a1cdde94d02;p=gcc.git

decl.c (make_typename_type): Use my_friendly_assert.

	* decl.c (make_typename_type): Use my_friendly_assert.
	* pt.c (tsubst_aggr_type): Rearrange context substitution.

From-SVN: r70475
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e7e0eddda9d..8f188b659b3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-15  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* decl.c (make_typename_type): Use my_friendly_assert.
+	* pt.c (tsubst_aggr_type): Rearrange context substitution.
+
 Thu Aug 14 12:19:25 CEST 2003  Jan Hubicka  <jh@suse.cz>
 
 	* method.c (use_thunk): Expand body directly.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index edb43d98a81..43ecde04415 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -5565,12 +5565,10 @@ tsubst_aggr_type (tree t,
 
 	  /* First, determine the context for the type we are looking
 	     up.  */
-	  if (TYPE_CONTEXT (t) != NULL_TREE)
-	    context = tsubst_aggr_type (TYPE_CONTEXT (t), args,
-					complain,
+	  context = TYPE_CONTEXT (t);
+	  if (context)
+	    context = tsubst_aggr_type (context, args, complain,
 					in_decl, /*entering_scope=*/1);
-	  else
-	    context = NULL_TREE;
 
 	  /* Then, figure out what arguments are appropriate for the
 	     type we are trying to find.  For example, given: