1 files changed, 13 insertions, 1 deletions
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index 848da6305dc..6e243dff58a 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -2164,7 +2164,19 @@ 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)
-	c_finish_expr_stmt (expr.value);
+	{
+	  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);
+	}
       pop_maybe_used (was_vm);
     }
   c_parser_skip_until_found (parser, CPP_CLOSE_PAREN, "expected %<)%>");