diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2017-07-05 09:20:42 +0200 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2017-07-05 15:45:55 +0000 |
| commit | 6b83037e3038cb540642dcafd3f36d513e0b088f (patch) | |
| tree | 5e367991ee3d21a2ff09d362f2a59e80b9ecd519 | |
| parent | b1241da7bee4160581e6dec94b88e5d4eb15ec56 (diff) | |
gcc/
Backport from trunk r249272.
2017-06-16 James Greenhalgh <james.greenhalgh@arm.com>
PR target/71778
* config/arm/arm-builtins.c (arm_expand_builtin_args): Return TARGET
if given a non-constant argument for an intrinsic which requires a
constant.
gcc/testsuite/
Backport from trunk r249272.
2017-06-16 James Greenhalgh <james.greenhalgh@arm.com>
PR target/71778
* gcc.target/arm/pr71778.c: New.
Change-Id: If82ba60fc82a4fb3b758b831d43fb49d263548e5
| -rw-r--r-- | gcc/config/arm/arm-builtins.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/arm/pr71778.c | 24 |
2 files changed, 30 insertions, 1 deletions
diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c index a0569ed10c5..8ecf58171c1 100644 --- a/gcc/config/arm/arm-builtins.c +++ b/gcc/config/arm/arm-builtins.c @@ -2245,7 +2245,12 @@ constant_arg: { error ("%Kargument %d must be a constant immediate", exp, argc + 1); - return const0_rtx; + /* We have failed to expand the pattern, and are safely + in to invalid code. But the mid-end will still try to + build an assignment for this node while it expands, + before stopping for the error, just pass it back + TARGET to ensure a valid assignment. */ + return target; } break; diff --git a/gcc/testsuite/gcc.target/arm/pr71778.c b/gcc/testsuite/gcc.target/arm/pr71778.c new file mode 100644 index 00000000000..d5b0d04e5e7 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/pr71778.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target arm_neon_ok } */ +/* { dg-options "-O2" } */ +/* { dg-add-options arm_neon } */ + +typedef __simd128_int32_t int32x4_t; + +__extension__ extern __inline int32x4_t +__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) +vshrq_n_s32 (int32x4_t __a, const int __b) +{ + /* Errors for arm_neon.h intrinsics using constants end up on the line + in arm_neon.h rather than the source file line. That means we + need to put the dg-error up here, rather than on line 22 where we'd + like it. */ + return (int32x4_t)__builtin_neon_vshrs_nv4si (__a, __b); /* { dg-error "argument 2 must be a constant immediate" } */ +} + +int32x4_t +shift (int32x4_t a, int b) +{ + return vshrq_n_s32 (a, b); +} + |