From a98152285e49156026d0b70bacfe562a6f9d3ac2 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 7 Nov 2016 14:07:32 +0100
Subject: [PATCH] re PR middle-end/71529 ([CHKP] ICE in expand_expr_real_1)

	PR middle-end/71529
	* gcc.target/i386/pr71529.C: Moved to ...
	* g++.dg/opt/pr71529.C: ... here.  New test.  Guard for i?86/x86_64.

	PR target/64411
	* gcc.target/i386/pr64411.C: Moved to ...
	* g++.dg/opt/pr64411.C: ... here.  New test.  Guard for i?86/x86_64
	lp64.

	PR target/65105
	* gcc.target/i386/pr65105-4.C: Moved to ...
	* g++.dg/opt/pr65105-4.C: ... here.  New test.  Guard for i?86/x86_64.
	Run into compile test rather than execute test.

From-SVN: r241903
---
 gcc/testsuite/ChangeLog                            | 16 ++++++++++++++++
 .../{gcc.target/i386 => g++.dg/opt}/pr64411.C      |  5 +++--
 .../{gcc.target/i386 => g++.dg/opt}/pr65105-4.C    |  6 +++---
 gcc/testsuite/g++.dg/opt/pr71529.C                 | 22 ++++++++++++++++++++++
 gcc/testsuite/gcc.target/i386/pr71529.C            | 22 ----------------------
 5 files changed, 44 insertions(+), 27 deletions(-)
 rename gcc/testsuite/{gcc.target/i386 => g++.dg/opt}/pr64411.C (67%)
 rename gcc/testsuite/{gcc.target/i386 => g++.dg/opt}/pr65105-4.C (61%)
 create mode 100644 gcc/testsuite/g++.dg/opt/pr71529.C
 delete mode 100644 gcc/testsuite/gcc.target/i386/pr71529.C

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 06798a9..716e6e2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2016-11-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/71529
+	* gcc.target/i386/pr71529.C: Moved to ...
+	* g++.dg/opt/pr71529.C: ... here.  New test.  Guard for i?86/x86_64.
+
+	PR target/64411
+	* gcc.target/i386/pr64411.C: Moved to ...
+	* g++.dg/opt/pr64411.C: ... here.  New test.  Guard for i?86/x86_64
+	lp64.
+
+	PR target/65105
+	* gcc.target/i386/pr65105-4.C: Moved to ...
+	* g++.dg/opt/pr65105-4.C: ... here.  New test.  Guard for i?86/x86_64.
+	Run into compile test rather than execute test.
+
 2016-11-07  Richard Biener  <rguenther@suse.de>
 
 	PR target/78229
diff --git a/gcc/testsuite/gcc.target/i386/pr64411.C b/gcc/testsuite/g++.dg/opt/pr64411.C
similarity index 67%
rename from gcc/testsuite/gcc.target/i386/pr64411.C
rename to gcc/testsuite/g++.dg/opt/pr64411.C
index 55858fb..122b9ee 100644
--- a/gcc/testsuite/gcc.target/i386/pr64411.C
+++ b/gcc/testsuite/g++.dg/opt/pr64411.C
@@ -1,5 +1,6 @@
-/* { dg-do compile } */
-/* { dg-options "-Os -mcmodel=medium -fPIC -fschedule-insns -fselective-scheduling" } */
+// PR target/64411
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } }
+// { dg-options "-Os -mcmodel=medium -fPIC -fschedule-insns -fselective-scheduling" }
 
 typedef __SIZE_TYPE__ size_t;
 
diff --git a/gcc/testsuite/gcc.target/i386/pr65105-4.C b/gcc/testsuite/g++.dg/opt/pr65105-4.C
similarity index 61%
rename from gcc/testsuite/gcc.target/i386/pr65105-4.C
rename to gcc/testsuite/g++.dg/opt/pr65105-4.C
index 9acf368..d79ba1a 100644
--- a/gcc/testsuite/gcc.target/i386/pr65105-4.C
+++ b/gcc/testsuite/g++.dg/opt/pr65105-4.C
@@ -1,6 +1,6 @@
-/* PR target/pr65105 */
-/* { dg-do run { target { ia32 } } } */
-/* { dg-options "-O2 -march=slm" } */
+// PR target/65105
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } }
+// { dg-options "-O2 -march=slm" }
 
 struct s {
   long long l1, l2, l3, l4, l5;
diff --git a/gcc/testsuite/g++.dg/opt/pr71529.C b/gcc/testsuite/g++.dg/opt/pr71529.C
new file mode 100644
index 0000000..148527f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/pr71529.C
@@ -0,0 +1,22 @@
+// PR middle-end/71529
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && { ! x32 } } } }
+// { dg-options "-fcheck-pointer-bounds -mmpx -O2" }
+
+class c1
+{
+ public:
+  virtual ~c1 ();
+};
+
+class c2
+{
+ public:
+  virtual ~c2 ();
+};
+
+class c3 : c1, c2 { };
+
+int main (int, char **)
+{
+  c3 obj;
+}
diff --git a/gcc/testsuite/gcc.target/i386/pr71529.C b/gcc/testsuite/gcc.target/i386/pr71529.C
deleted file mode 100644
index 3169101..0000000
--- a/gcc/testsuite/gcc.target/i386/pr71529.C
+++ /dev/null
@@ -1,22 +0,0 @@
-/* PR71529 */
-/* { dg-do compile { target { ! x32 } } } */
-/* { dg-options "-fcheck-pointer-bounds -mmpx -O2" } */
-
-class c1
-{
- public:
-  virtual ~c1 ();
-};
-
-class c2
-{
- public:
-  virtual ~c2 ();
-};
-
-class c3 : c1, c2 { };
-
-int main (int, char **)
-{
-  c3 obj;
-}
-- 
2.7.4