From 9c9309815325c3da45ec43a0949f6619788e80ad Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@gcc.gnu.org>
Date: Sat, 15 Jul 2006 17:03:44 +0000
Subject: [PATCH] revert: re PR c/28280 (bogus "statement with no effect"
 warning with VLA and typeof)

Revert:
        PR c/28280
        * c-parser.c (c_parser_typeof_specifier): Don't use
        c_finish_expr_stmt, open code desired semantics instead.

From-SVN: r115479
---
 gcc/ChangeLog                |  4 ----
 gcc/c-parser.c               | 14 +-------------
 gcc/testsuite/gcc.dg/vla-9.c |  9 ---------
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 gcc/testsuite/gcc.dg/vla-9.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8bdcd70435ab..0a7a902eef6b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -83,10 +83,6 @@
 
 2006-07-12  Mike Stump  <mrs@apple.com>
 
-	PR c/28280
-	* c-parser.c (c_parser_typeof_specifier): Don't use
-	c_finish_expr_stmt, open code desired semantics instead.
-
 	* protoize.c (edit_fn_definition): Add volatile to clean_text_p.
 
 2006-07-10  Eric Christopher  <echristo@apple.com>
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index d59128480c86..32d2c5108bfa 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -2164,19 +2164,7 @@ c_parser_typeof_specifier (c_parser *parser)
 	 is evaluated, this can be evaluated.  For now, we avoid
 	 evaluation when the context might.  */
       if (!skip_evaluation && was_vm)
-	{
-	  tree e = expr.value;
-
-	  /* If the expression is not of a type to which we cannot assign a line
-	     number, wrap the thing in a no-op NOP_EXPR.  */
-	  if (DECL_P (e) || CONSTANT_CLASS_P (e))
-	    e = build1 (NOP_EXPR, void_type_node, e);
-
-	  if (EXPR_P (e))
-	    SET_EXPR_LOCATION (e, input_location);
-
-	  add_stmt (e);
-	}
+	c_finish_expr_stmt (expr.value);
       pop_maybe_used (was_vm);
     }
   c_parser_skip_until_found (parser, CPP_CLOSE_PAREN, "expected %<)%>");
diff --git a/gcc/testsuite/gcc.dg/vla-9.c b/gcc/testsuite/gcc.dg/vla-9.c
deleted file mode 100644
index 0b623b39da78..000000000000
--- a/gcc/testsuite/gcc.dg/vla-9.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* { dg-do compile  } */
-/* { dg-options "-std=c99 -pedantic-errors -W -Wall" } */
-/* PR c/28280 */
-
-void f(__SIZE_TYPE__ d)
-{
-  typedef int t[d];
-  t *g = (__typeof (g)) d;
-}
-- 
GitLab