call.c (build_x_va_arg): Check if in a template decl.

	* call.c (build_x_va_arg): Check if in a template decl.
	* pt.c (tsubst_copy, case VA_ARG_EXPR): Use build_x_va_arg.

From-SVN: r34645

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0699f15..e05c3d3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-22  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * call.c (build_x_va_arg): Check if in a template decl.
+       * pt.c (tsubst_copy, case VA_ARG_EXPR): Use build_x_va_arg.
+
 2000-06-20  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * class.c (push_lang_context): TYPE_NAME gets you to the Java

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 7b7d96b..a155f10 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3838,6 +3838,9 @@ build_x_va_arg (expr, type)
      tree expr;
      tree type;
 {
+  if (processing_template_decl)
+    return build_min (VA_ARG_EXPR, type, expr);
+  
   type = complete_type_or_else (type, NULL_TREE);
 
   if (expr == error_mark_node || !type)

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 70ad846..6fcc9e4 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7099,7 +7099,7 @@ tsubst_copy (t, args, complain, in_decl)
       }
 
     case VA_ARG_EXPR:
-      return build_va_arg (tsubst_copy (TREE_OPERAND (t, 0), args, complain,
+      return build_x_va_arg (tsubst_copy (TREE_OPERAND (t, 0), args, complain,
                                        in_decl),
                           tsubst (TREE_TYPE (t), args, complain, in_decl));