From ae4c92c0df5bdac30960b678cb3dcaf474bc6705 Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 6 Mar 2018 09:23:36 +0000
Subject: [PATCH] 	PR inline-asm/84683 	* reg-stack.c
 (move_for_stack_reg): If any_malformed_asm, avoid 	assertion failure.

	* g++.dg/ext/pr84683.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258273 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                      |  4 ++++
 gcc/reg-stack.c                    |  3 ++-
 gcc/testsuite/ChangeLog            |  3 +++
 gcc/testsuite/g++.dg/ext/pr84683.C | 13 +++++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/ext/pr84683.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09123ede820..14cf229315c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2018-03-06  Jakub Jelinek  <jakub@redhat.com>
 
+	PR inline-asm/84683
+	* reg-stack.c (move_for_stack_reg): If any_malformed_asm, avoid
+	assertion failure.
+
 	PR tree-optimization/84687
 	* omp-simd-clone.c (simd_clone_create): Clear DECL_BUILT_IN_CLASS
 	on new_node->decl.
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 94748965ca9..82feb5d84a0 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -1170,7 +1170,8 @@ move_for_stack_reg (rtx_insn *insn, stack_ptr regstack, rtx pat)
 	  && XINT (SET_SRC (XVECEXP (pat, 0, 1)), 1) == UNSPEC_TAN)
 	emit_swap_insn (insn, regstack, dest);
       else
-	gcc_assert (get_hard_regnum (regstack, dest) < FIRST_STACK_REG);
+	gcc_assert (get_hard_regnum (regstack, dest) < FIRST_STACK_REG
+		    || any_malformed_asm);
 
       gcc_assert (regstack->top < REG_STACK_SIZE);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e507037951..edce5a57c50 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2018-03-06  Jakub Jelinek  <jakub@redhat.com>
 
+	PR inline-asm/84683
+	* g++.dg/ext/pr84683.C: New test.
+
 	PR tree-optimization/84687
 	* gcc.dg/pr84687.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/ext/pr84683.C b/gcc/testsuite/g++.dg/ext/pr84683.C
new file mode 100644
index 00000000000..3c66bcf59ba
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/pr84683.C
@@ -0,0 +1,13 @@
+// PR inline-asm/84683
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-options "-O2" }
+
+void
+foo (float b, double c)
+{
+  for (int e = 0; e < 2; e++)
+    {
+      asm volatile ("" : "+f" (c));	// { dg-error "must specify a single register" }
+      asm ("" : "+rm" (c = b));
+    }
+}
-- 
2.11.4.GIT