OSDN Git Service

PR c++/57545
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 9 Jul 2013 17:50:44 +0000 (17:50 +0000)
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 9 Jul 2013 17:50:44 +0000 (17:50 +0000)
* pt.c (convert_nontype_argument) [INTEGER_CST]: Force the
argument to have the exact type of the parameter.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@200831 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/cp/ChangeLog
gcc/cp/pt.c
gcc/testsuite/g++.dg/debug/template2.C [new file with mode: 0644]

index f11ad34..a9abf59 100644 (file)
@@ -1,5 +1,9 @@
 2013-07-09  Jason Merrill  <jason@redhat.com>
 
+       PR c++/57545
+       * pt.c (convert_nontype_argument) [INTEGER_CST]: Force the
+       argument to have the exact type of the parameter.
+
        PR c++/57551
        * semantics.c (cxx_eval_indirect_ref): Don't try to look through
        a POINTER_PLUS_EXPR for type punning diagnostic.
index 7b94e41..4fbf9d5 100644 (file)
@@ -5521,6 +5521,10 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
          else
            return NULL_TREE;
        }
+
+      /* Avoid typedef problems.  */
+      if (TREE_TYPE (expr) != type)
+       expr = fold_convert (type, expr);
     }
   /* [temp.arg.nontype]/5, bullet 2
 
diff --git a/gcc/testsuite/g++.dg/debug/template2.C b/gcc/testsuite/g++.dg/debug/template2.C
new file mode 100644 (file)
index 0000000..9f5bcd9
--- /dev/null
@@ -0,0 +1,14 @@
+// PR c++/57545
+
+template<typename T, long unsigned int N>
+struct array {
+    T data[N];
+};
+
+template<typename T>
+struct derived {
+    typedef long unsigned int size_type;
+    static const size_type n = 42;
+
+    array<int, n> a;
+};