From 7cdd2e6c6effc66cf631589102ac6345627022c2 Mon Sep 17 00:00:00 2001 From: Ed Smith-Rowland <3dw4rd@verizon.net> Date: Wed, 7 Dec 2011 15:41:03 +0000 Subject: [PATCH] re PR c++/51420 ([c++0x] ICE with invalid user-defined literals) PR c++/51420 * parser.c (lookup_literal_operator): Check that declaration is an overloaded function. From-SVN: r182083 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/pr51420.C | 8 ++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr51420.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index defc0a5eb44b..71a707e80bb5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-12-07 Ed Smith-Rowland <3dw4rd@verizon.net> + + PR c++/51420 + * parser.c (lookup_literal_operator): Check that declaration is an + overloaded function. + 2011-12-06 Jakub Jelinek PR c++/51430 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index daf2ded45dc2..17a607d4f3d4 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -3554,7 +3554,7 @@ lookup_literal_operator (tree name, VEC(tree,gc) *args) { tree decl, fns; decl = lookup_name (name); - if (!decl || decl == error_mark_node) + if (!decl || !is_overloaded_fn (decl)) return error_mark_node; for (fns = decl; fns; fns = OVL_NEXT (fns)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 857677ba3799..5ecacdd125a6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-07 Ed Smith-Rowland <3dw4rd@verizon.net> + + PR c++/51420 + * g++.dg/cpp0x/pr51420.C: New. + 2011-12-07 Richard Guenther PR lto/48100 diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51420.C b/gcc/testsuite/g++.dg/cpp0x/pr51420.C new file mode 100644 index 000000000000..aec8cb1fcbcf --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr51420.C @@ -0,0 +1,8 @@ +// { dg-options "-std=c++11" } + +void +foo() +{ + float x = operator"" _F(); // { dg-error "was not declared in this scope" } + float y = 0_F; // { dg-error "unable to find numeric literal operator" } +} -- 2.43.5