From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 13 Nov 2020 22:27:23 +0000 (+0100)
Subject: testsuite: guality/redeclaration1.C test workaround
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5cd4f8901adbd8b4040cafaed7fef850047461ee;p=gcc.git

testsuite: guality/redeclaration1.C test workaround

Apparently older GDB versions didn't handle this test right and so while
it has been properly printing 42 on line 14 (e.g. on x86_64), it issued
a weird error on line 17 (and because it didn't print any value, guality
testsuite wasn't marking it as FAIL).
That has been apparently fixed in GDB 10, where it now (on x86_64) prints
properly.
Unfortunately that revealed that the test can suffer from instruction
scheduling, where e.g. on i686 (but various other arches) the very first
insn of the function (or whatever b 14 is on) happens to be load of the
S::i variable from memory and that insn has the inner lexical scope, so
GDB 10 prints there 24 instead of 42.  The following insn is then
the first store to l and there the automatic i is in scope and prints as 42
and then the second store to l where the inner lexical scope is current
and prints 24 again.
The test wasn't meant about insn scheduling but about whether we emit the
DIEs properly, so this hack attempts to prevent the undesirable scheduling.

2020-11-13  Jakub Jelinek  <jakub@redhat.com>

	* g++.dg/guality/redeclaration1.C (p): New variable.
	(S::f): Increment what p points to before storing S::i into l.  Adjust
	gdb-test line numbers.
	(main): Initialize p to address of an automatic variable.
---

diff --git a/gcc/testsuite/g++.dg/guality/redeclaration1.C b/gcc/testsuite/g++.dg/guality/redeclaration1.C
index 93b0750b93c..bd0209f8adb 100644
--- a/gcc/testsuite/g++.dg/guality/redeclaration1.C
+++ b/gcc/testsuite/g++.dg/guality/redeclaration1.C
@@ -3,6 +3,7 @@
 // { dg-skip-if "" { *-*-* } { "-flto" } { "" } }
 
 volatile int l;
+int *volatile p;
 
 namespace S
 {
@@ -11,10 +12,11 @@ namespace S
   f()
   {
     int i = 42;
-    l = i;		// { dg-final { gdb-test 14 "i" "42" } }
+    l = i;		// { dg-final { gdb-test 15 "i" "42" } }
     {
       extern int i;
-      l = i;		// { dg-final { gdb-test 17 "i" "24" } }
+      p[0]++;
+      l = i;		// { dg-final { gdb-test 19 "i" "24" } }
     }
   }
 }
@@ -22,6 +24,8 @@ namespace S
 int
 main (void)
 {
+  int x = 0;
+  p = &x;
   S::f ();
   return 0;
 }