From f5d47c52788f96261420f6e93e9a30d7ba1053f8 Mon Sep 17 00:00:00 2001
From: mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Dec 2017 14:58:17 +0000
Subject: [PATCH] 	PR c++/83490 	* config/i386/i386.c
 (init_cumulative_args): Don't check TYPE_EMPTY_P 	on an error node.

	* g++.dg/abi/pr83490.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@255824 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                      |  6 ++++++
 gcc/config/i386/i386.c             |  2 +-
 gcc/testsuite/ChangeLog            |  5 +++++
 gcc/testsuite/g++.dg/abi/pr83490.C | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/abi/pr83490.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6af469c856..05e2a158fba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/83490
+	* config/i386/i386.c (init_cumulative_args): Don't check TYPE_EMPTY_P
+	on an error node.						     
+
 2017-12-19  Claudiu Zissulescu  <claziss@synopsys.com>
 
 	* config/arc/arc.c (overriderregs): New variable.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index b9f6e27f9b1..82a79bdb426 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -7218,7 +7218,7 @@ init_cumulative_args (CUMULATIVE_ARGS *cum,  /* Argument info to initialize */
       bool seen_empty_type = false;
       FOREACH_FUNCTION_ARGS (fntype, argtype, iter)
 	{
-	  if (VOID_TYPE_P (argtype))
+	  if (argtype == error_mark_node || VOID_TYPE_P (argtype))
 	    break;
 	  if (TYPE_EMPTY_P (argtype))
 	    seen_empty_type = true;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9849fbaa8af..dd51941daec 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/83490
+	* g++.dg/abi/pr83490.C: New test.
+
 2017-12-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR middle-end/83471
diff --git a/gcc/testsuite/g++.dg/abi/pr83490.C b/gcc/testsuite/g++.dg/abi/pr83490.C
new file mode 100644
index 00000000000..850c4c0fd9e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/pr83490.C
@@ -0,0 +1,17 @@
+// PR c++/83490
+// { dg-options "-Wabi" }
+
+struct A
+{
+  A foo(void i = 0);  // { dg-error "incomplete type|invalid use" }
+};
+
+void bar()
+{
+  A().foo();
+}
+
+A A::foo(void i)  // { dg-error "incomplete type|invalid use" }
+{
+  return A();
+}
-- 
2.11.4.GIT