OSDN Git Service

* semantics.c (describable_type): Don't pretend to be in a template.
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 2 Sep 2009 15:48:52 +0000 (15:48 +0000)
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 2 Sep 2009 15:48:52 +0000 (15:48 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151335 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/cp/ChangeLog
gcc/cp/semantics.c

index d4745c3..0a351b2 100644 (file)
@@ -1,4 +1,6 @@
-2009-09-01  Jason Merrill  <jason@redhat.com>
+2009-09-02  Jason Merrill  <jason@redhat.com>
+
+       * semantics.c (describable_type): Don't pretend to be in a template.
 
        * ptree.c (cxx_print_type) [DECLTYPE_TYPE]: Print the expression.
 
index 1c16b72..1e5255e 100644 (file)
@@ -4543,17 +4543,13 @@ describable_type (tree expr)
 {
   tree type = NULL_TREE;
 
-  /* processing_template_decl isn't set when we're called from the mangling
-     code, so bump it now.  */
-  ++processing_template_decl;
   if (! type_dependent_expression_p (expr)
       && ! type_unknown_p (expr))
     {
-      type = TREE_TYPE (expr);
+      type = unlowered_expr_type (expr);
       if (real_lvalue_p (expr))
        type = build_reference_type (type);
     }
-  --processing_template_decl;
 
   if (type)
     return type;