From 368ad4b99d582451083988a9975b867443c2edd0 Mon Sep 17 00:00:00 2001
From: giovannibajo <giovannibajo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 23 Apr 2004 12:57:19 +0000
Subject: [PATCH] PR c++/15064 * parser.c
(cp_parser_postfix_expression): typeid operator cannot be used in
integral constant expressions.
PR c++/15064
* g++.dg/template/crash18.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81088 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/parser.c | 5 ++++-
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/template/crash18.C | 13 +++++++++++++
4 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/template/crash18.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f654b18f735a..59402a0aa1ff 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-23 Giovanni Bajo <giovannibajo@gcc.gnu.org>
+
+ PR c++/15064
+ * parser.c (cp_parser_postfix_expression): typeid operator cannot be
+ used in integral constant expressions.
+
2004-04-22 Mark Mitchell <mark@codesourcery.com>
* init.c (build_aggr_init): Fix accidental use of C99 construct in
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 0732a650452d..6fb8da5d158c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3594,7 +3594,10 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p)
/* Look for the `)' token. */
cp_parser_require (parser, CPP_CLOSE_PAREN, "`)'");
}
-
+ /* `typeid' may not appear in an integral constant expression. */
+ if (cp_parser_non_integral_constant_expression(parser,
+ "`typeid' operator"))
+ return error_mark_node;
/* Restore the saved message. */
parser->type_definition_forbidden_message = saved_message;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index aa479b4aa237..b57694e76f40 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-23 Giovanni Bajo <giovannibajo@gcc.gnu.org>
+
+ PR c++/15064
+ * g++.dg/template/crash18.C: New test.
+
2004-04-22 Mark Mitchell <mark@codesourcery.com>
* g++.dg/ext/complit3.C: New test.
diff --git a/gcc/testsuite/g++.dg/template/crash18.C b/gcc/testsuite/g++.dg/template/crash18.C
new file mode 100644
index 000000000000..5eb92929cbdf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash18.C
@@ -0,0 +1,13 @@
+// { dg-do compile }
+// Contributed by: <leif dot lonnblad at thep dot lu dot se>
+// PR c++/15064: typeid does not form an integral constant expression
+
+#include <typeinfo>
+
+template <typename T>
+void dummy() {
+ const std::type_info& t = typeid(T);
+ const std::type_info& t2 = typeid(float);
+}
+
+template void dummy<int>(void);
--
GitLab