Re: Bug 52869 - [DR 1207] "this" not being allowed in noexcept clauses

[Umesh Kalappa <umesh.kalappa0@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]

My bad Marek and thank you for pointing that out.

Please find the attached correct one (pr52869.patch) .

~Umesh

[-- Attachment #2: pr52869.patch --]
[-- Type: application/octet-stream, Size: 2421 bytes --]

Index: gcc/cp/ChangeLog
===================================================================
--- gcc/cp/ChangeLog	(revision 266026)
+++ gcc/cp/ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2018-11-14  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+
+	PR c++/52869
+	*parser.c () :  restore the old current_class_{ptr,ref} by
+	inject_this_parameter().
+
 2018-11-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* parser.c (cp_parser_omp_clause_final, cp_parser_omp_clause_if): Use
Index: gcc/cp/parser.c
===================================================================
--- gcc/cp/parser.c	(revision 266026)
+++ gcc/cp/parser.c	(working copy)
@@ -24615,11 +24615,24 @@
     {
       tree expr;
       cp_lexer_consume_token (parser->lexer);
-
+   
       if (cp_lexer_peek_token (parser->lexer)->type == CPP_OPEN_PAREN)
 	{
 	  matching_parens parens;
 	  parens.consume_open (parser);
+	  
+	  if (current_class_type)
+              inject_this_parameter (current_class_type, TYPE_UNQUALIFIED);
+          else
+            {
+              /*clear the current_class_ptr for non class type , like 
+		int foo() noexcept(*this)
+		{		
+		  return 1;
+		}	
+	      */
+                current_class_ptr = NULL_TREE;
+            }
 
 	  if (require_constexpr)
 	    {
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog	(revision 266026)
+++ gcc/testsuite/ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2018-11-14  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+
+	PR g++.dg/52869
+	* g++.dg/pr52869.C: New.
+
 2018-11-11  Xianmiao Qu  <xianmiao_qu@c-sky.com>
 
 	* gcc.target/csky/fnmul-1.c: New.
Index: gcc/testsuite/g++.dg/pr52869.C
===================================================================
--- gcc/testsuite/g++.dg/pr52869.C	(nonexistent)
+++ gcc/testsuite/g++.dg/pr52869.C	(working copy)
@@ -0,0 +1,26 @@
+/* { dg-do compile } */
+/* { dg-options "-O0 -g" } */
+
+struct S {
+    void f() { }
+    void g() noexcept(noexcept(f())) { }
+    void h() noexcept(noexcept(this->f())) { }
+};
+
+struct Nyan {
+	constexpr Nyan &operator++() noexcept { return *this; }
+	constexpr void omg() noexcept(noexcept(++*this)) {}
+};
+
+template< typename T >
+T sine( T const& a, T const& b ) noexcept
+{
+    static_assert( noexcept( T(a / sqrt(a * a  + b * b)) ), "throwing expr" );
+    return a / sqrt(a * a  + b * b);
+}
+
+int foo() noexcept
+{
+  return 1;
+}
+