diff options
author | Tom de Vries <tdevries@suse.de> | 2019-10-21 15:08:54 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2019-10-21 15:08:54 +0200 |
commit | 94cb3754118669d46c8ad87c986d8d9c59fac65a (patch) | |
tree | 854f019d56306ec76d180b79e1a352a6fbf4d183 /gdb/testsuite/gdb.base/infcall-nested-structs.c | |
parent | 95cc7c169c4bbb6f10e630184f527b20b83fc5c3 (diff) | |
download | gdb-94cb3754118669d46c8ad87c986d8d9c59fac65a.zip gdb-94cb3754118669d46c8ad87c986d8d9c59fac65a.tar.gz gdb-94cb3754118669d46c8ad87c986d8d9c59fac65a.tar.bz2 |
[gdb/testsuite] Compile infcall-nested-structs.exp with -O2
As mentioned in commit 745ff14e6e1 "[gdb/tdep] Fix 'Unexpected register class'
assert in amd64_push_arguments", of the 12 KFAILs added there, 3 are KPASSing
with g++ 4.8.5.
The KPASSes are due to:
- gdb incorrectly expecting the second half of the result of function
rtn_str_struct_02_01 in register %rdx.
- rtn_str_struct_02_01 using %rdx as a temporary, thereby accidentally setting
it to the expected value.
Reduce the chance of hiding errors due accidental register settings by
compiling the test-case with -O2.
This fixes the KPASSes when applied on top of commit 745ff14e6e1.
Tested on x86_64-linux.
Tested with g++ 4.8.5, 7.4.1, 8.3.1, 9.2.1.
gdb/testsuite/ChangeLog:
2019-10-21 Tom de Vries <tdevries@suse.de>
* gdb.base/infcall-nested-structs.c: Add
__attribute__((noinline,noclone)) to all functions.
(call_all): Add missing variable initialization. Simplify return value.
(breakpt): Increment volatile variable, to prevent call from being
optimized out.
* gdb.base/infcall-nested-structs.exp: Compile with -O2.
Change-Id: Ic027e1c957fecd6686345639db99f5eaee3cdf05
Diffstat (limited to 'gdb/testsuite/gdb.base/infcall-nested-structs.c')
-rw-r--r-- | gdb/testsuite/gdb.base/infcall-nested-structs.c | 88 |
1 files changed, 53 insertions, 35 deletions
diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs.c b/gdb/testsuite/gdb.base/infcall-nested-structs.c index 795ab4a..f2a4294 100644 --- a/gdb/testsuite/gdb.base/infcall-nested-structs.c +++ b/gdb/testsuite/gdb.base/infcall-nested-structs.c @@ -51,13 +51,13 @@ typedef long double _Complex tldc; #endif /* TEST_COMPLEX */ #define MAKE_CHECK_FUNCS(TYPE) \ - int \ + int __attribute__((noinline,noclone)) \ check_arg_ ## TYPE (struct TYPE arg) \ { \ return cmp_ ## TYPE (arg, ref_val_ ## TYPE); \ } \ \ - struct TYPE \ + struct TYPE __attribute__((noinline,noclone)) \ rtn_str_ ## TYPE (void) \ { \ return (ref_val_ ## TYPE); \ @@ -128,125 +128,141 @@ struct struct_static_06_04 { ES(es1); ES(es2); static tA a; ES(es3); static tB b #endif -int cmp_struct_01_01 (struct struct_01_01 a, struct struct_01_01 b) +int __attribute__((noinline,noclone)) +cmp_struct_01_01 (struct struct_01_01 a, struct struct_01_01 b) { return a.s2.s1.a == b.s2.s1.a; } -int cmp_struct_01_02 (struct struct_01_02 a, struct struct_01_02 b) +int __attribute__((noinline,noclone)) +cmp_struct_01_02 (struct struct_01_02 a, struct struct_01_02 b) { return a.a == b.a; } -int cmp_struct_01_03 (struct struct_01_03 a, struct struct_01_03 b) +int __attribute__((noinline,noclone)) +cmp_struct_01_03 (struct struct_01_03 a, struct struct_01_03 b) { return a.s4.s3.a == b.s4.s3.a; } -int cmp_struct_01_04 (struct struct_01_04 a, struct struct_01_04 b) +int __attribute__((noinline,noclone)) +cmp_struct_01_04 (struct struct_01_04 a, struct struct_01_04 b) { return a.a == b.a; } -int cmp_struct_02_01 (struct struct_02_01 a, struct struct_02_01 b) +int __attribute__((noinline,noclone)) +cmp_struct_02_01 (struct struct_02_01 a, struct struct_02_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b; } -int cmp_struct_02_02 (struct struct_02_02 a, struct struct_02_02 b) +int __attribute__((noinline,noclone)) +cmp_struct_02_02 (struct struct_02_02 a, struct struct_02_02 b) { return a.a == b.a && a.b == b.b; } -int cmp_struct_02_03 (struct struct_02_03 a, struct struct_02_03 b) +int __attribute__((noinline,noclone)) +cmp_struct_02_03 (struct struct_02_03 a, struct struct_02_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b; } -int cmp_struct_02_04 (struct struct_02_04 a, struct struct_02_04 b) +int __attribute__((noinline,noclone)) +cmp_struct_02_04 (struct struct_02_04 a, struct struct_02_04 b) { return a.a == b.a && a.b == b.b; } -int cmp_struct_04_01 (struct struct_04_01 a, struct struct_04_01 b) +int __attribute__((noinline,noclone)) +cmp_struct_04_01 (struct struct_04_01 a, struct struct_04_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d; } -int cmp_struct_04_02 (struct struct_04_02 a, struct struct_04_02 b) +int __attribute__((noinline,noclone)) +cmp_struct_04_02 (struct struct_04_02 a, struct struct_04_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int cmp_struct_04_03 (struct struct_04_03 a, struct struct_04_03 b) +int __attribute__((noinline,noclone)) +cmp_struct_04_03 (struct struct_04_03 a, struct struct_04_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d; } -int cmp_struct_04_04 (struct struct_04_04 a, struct struct_04_04 b) +int __attribute__((noinline,noclone)) +cmp_struct_04_04 (struct struct_04_04 a, struct struct_04_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int cmp_struct_05_01 (struct struct_05_01 a, struct struct_05_01 b) +int __attribute__((noinline,noclone)) +cmp_struct_05_01 (struct struct_05_01 a, struct struct_05_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d && a.s2.s1.e == b.s2.s1.e; } -int cmp_struct_05_02 (struct struct_05_02 a, struct struct_05_02 b) +int __attribute__((noinline,noclone)) +cmp_struct_05_02 (struct struct_05_02 a, struct struct_05_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e; } -int cmp_struct_05_03 (struct struct_05_03 a, struct struct_05_03 b) +int __attribute__((noinline,noclone)) +cmp_struct_05_03 (struct struct_05_03 a, struct struct_05_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d && a.s12.s11.e == b.s12.s11.e; } -int cmp_struct_05_04 (struct struct_05_04 a, struct struct_05_04 b) +int __attribute__((noinline,noclone)) +cmp_struct_05_04 (struct struct_05_04 a, struct struct_05_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e; } #ifdef __cplusplus -int +int __attribute__((noinline,noclone)) cmp_struct_static_02_01 (struct struct_static_02_01 a, struct struct_static_02_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_02_02 (struct struct_static_02_02 a, struct struct_static_02_02 b) { return a.a == b.a && a.b == b.b; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_02_03 (struct struct_static_02_03 a, struct struct_static_02_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_02_04 (struct struct_static_02_04 a, struct struct_static_02_04 b) { return a.a == b.a && a.b == b.b; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_04_01 (struct struct_static_04_01 a, struct struct_static_04_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_04_02 (struct struct_static_04_02 a, struct struct_static_04_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_04_03 (struct struct_static_04_03 a, struct struct_static_04_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_04_04 (struct struct_static_04_04 a, struct struct_static_04_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_06_01 (struct struct_static_06_01 a, struct struct_static_06_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d && a.s2.s1.e == b.s2.s1.e && a.f == b.f; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_06_02 (struct struct_static_06_02 a, struct struct_static_06_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e && a.f == b.f; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_06_03 (struct struct_static_06_03 a, struct struct_static_06_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d && a.s12.s11.e == b.s12.s11.e && a.s12.s11.f == b.s12.s11.f; } -int +int __attribute__((noinline,noclone)) cmp_struct_static_06_04 (struct struct_static_06_04 a, struct struct_static_06_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e @@ -350,10 +366,10 @@ MAKE_CHECK_FUNCS(struct_static_06_04) #define CALL_LINE(NAME) val += check_arg_ ## NAME (rtn_str_ ## NAME ()) -int +int __attribute__((noinline,noclone)) call_all () { - int val; + int val = 0; CALL_LINE(struct_01_01); CALL_LINE(struct_01_02); @@ -386,13 +402,15 @@ call_all () CALL_LINE(struct_static_06_04); #endif - return (val != 4); + return val; } -void +int volatile v = 1; + +void __attribute__((noinline, noclone)) breakpt (void) { - /* Nothing. */ + v++; } int |