OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: re PR target/82112 (internal compiler error: in fold_convert_loc, at fold-const.c:2262) 

Backported from mainline
	2017-09-12  Jakub Jelinek  <jakub@redhat.com>

	PR target/82112
	* config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin): For
	ALTIVEC_BUILTIN_VEC_LD if arg1 has array type call default_conversion
	on it early, rather than manual conversion late.  For
	ALTIVEC_BUILTIN_VEC_ST if arg2 has array type call default_conversion
	instead of performing manual conversion.

	* gcc.target/powerpc/pr82112.c: New test.
	* g++.dg/ext/altivec-18.C: New test.

From-SVN: r252804
This commit is contained in:
Jakub Jelinek 2017-09-15 13:24:49 +02:00 committed by Jakub Jelinek
parent c395cf94fc
commit 47d845c39f
5 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ChangeLog
View File

@ -1,3 +1,15 @@
2017-09-15 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2017-09-12 Jakub Jelinek <jakub@redhat.com>
PR target/82112
* config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin): For
ALTIVEC_BUILTIN_VEC_LD if arg1 has array type call default_conversion
on it early, rather than manual conversion late. For
ALTIVEC_BUILTIN_VEC_ST if arg2 has array type call default_conversion
instead of performing manual conversion.
2017-09-15 Martin Liska <mliska@suse.cz>
Backport from mainline

26
gcc/config/rs6000/rs6000-c.c
View File

@ -6218,7 +6218,13 @@ altivec_resolve_overloaded_builtin (location_t loc, tree fndecl,
/* Strip qualifiers like "const" from the pointer arg. */
tree arg1_type = TREE_TYPE (arg1);
if (!POINTER_TYPE_P (arg1_type) && TREE_CODE (arg1_type) != ARRAY_TYPE)
if (TREE_CODE (arg1_type) == ARRAY_TYPE && c_dialect_cxx ())
{
/* Force array-to-pointer decay for C++. */
arg1 = default_conversion (arg1);
arg1_type = TREE_TYPE (arg1);
}
if (!POINTER_TYPE_P (arg1_type))
goto bad;
tree inner_type = TREE_TYPE (arg1_type);
@ -6238,15 +6244,6 @@ altivec_resolve_overloaded_builtin (location_t loc, tree fndecl,
if (!ptrofftype_p (TREE_TYPE (arg0)))
arg0 = build1 (NOP_EXPR, sizetype, arg0);
tree arg1_type = TREE_TYPE (arg1);
if (TREE_CODE (arg1_type) == ARRAY_TYPE)
{
arg1_type = TYPE_POINTER_TO (TREE_TYPE (arg1_type));
tree const0 = build_int_cstu (sizetype, 0);
tree arg1_elt0 = build_array_ref (loc, arg1, const0);
arg1 = build1 (ADDR_EXPR, arg1_type, arg1_elt0);
}
tree addr = fold_build2_loc (loc, POINTER_PLUS_EXPR, arg1_type,
arg1, arg0);
tree aligned = fold_build2_loc (loc, BIT_AND_EXPR, arg1_type, addr,
@ -6301,12 +6298,11 @@ altivec_resolve_overloaded_builtin (location_t loc, tree fndecl,
arg1 = build1 (NOP_EXPR, sizetype, arg1);
tree arg2_type = TREE_TYPE (arg2);
if (TREE_CODE (arg2_type) == ARRAY_TYPE)
if (TREE_CODE (arg2_type) == ARRAY_TYPE && c_dialect_cxx ())
{
arg2_type = TYPE_POINTER_TO (TREE_TYPE (arg2_type));
tree const0 = build_int_cstu (sizetype, 0);
tree arg2_elt0 = build_array_ref (loc, arg2, const0);
arg2 = build1 (ADDR_EXPR, arg2_type, arg2_elt0);
/* Force array-to-pointer decay for C++. */
arg2 = default_conversion (arg2);
arg2_type = TREE_TYPE (arg2);
}
/* Find the built-in to make sure a compatible one exists; if not

4
gcc/testsuite/ChangeLog
View File

@ -3,6 +3,10 @@
Backported from mainline
2017-09-12 Jakub Jelinek <jakub@redhat.com>
PR target/82112
* gcc.target/powerpc/pr82112.c: New test.
* g++.dg/ext/altivec-18.C: New test.
PR target/82112
* c-c++-common/pr82112.c: New test.
* gcc.dg/pr82112.c: New test.

14
gcc/testsuite/g++.dg/ext/altivec-18.C Normal file
View File

@ -0,0 +1,14 @@
// PR target/82112
// { dg-do compile { target powerpc*-*-* } }
// { dg-require-effective-target powerpc_altivec_ok }
// { dg-options "-maltivec" }
#include <altivec.h>
__attribute__((aligned (16))) extern const unsigned char c[16];
void
foo (void)
{
vec_ld (0, c);
}

16
gcc/testsuite/gcc.target/powerpc/pr82112.c Normal file
View File

@ -0,0 +1,16 @@
/* PR target/82112 */
/* { dg-do compile } */
/* { dg-require-effective-target powerpc_altivec_ok } */
/* { dg-options "-maltivec -std=gnu90" } */
#include <altivec.h>
struct __attribute__((aligned (16))) S { unsigned char c[64]; } bar (void);
vector unsigned char v;
void
foo (void)
{
vec_ld (0, bar ().c); /* { dg-error "invalid parameter combination for AltiVec intrinsic" } */
vec_st (v, 0, bar ().c); /* { dg-error "invalid parameter combination for AltiVec intrinsic" } */
}