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

re PR c++/71537 (GCC rejects consetxpr boolean conversions and comparisons on the result of pointer arithmetic.) 

PR c++/71537
	* fold-const-call.c (fold_const_call): Handle
	CFN_BUILT_IN_{INDEX,STRCHR,RINDEX,STRRCHR}.

	* g++.dg/cpp0x/constexpr-strchr.C: New test.

From-SVN: r243284
This commit is contained in:
Jakub Jelinek 2016-12-06 10:22:36 +01:00 committed by Jakub Jelinek
parent 0d3ce69b79
commit bf2d0849a3
4 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,5 +1,9 @@
2016-12-06 Jakub Jelinek <jakub@redhat.com>
PR c++/71537
* fold-const-call.c (fold_const_call): Handle
CFN_BUILT_IN_{INDEX,STRCHR,RINDEX,STRRCHR}.
PR tree-optimization/78675
* tree-vect-loop.c (vectorizable_live_operation): For
VECTOR_BOOLEAN_TYPE_P vectype use integral type with bitsize precision

25
gcc/fold-const-call.c
View File

@ -1383,6 +1383,7 @@ tree
fold_const_call (combined_fn fn, tree type, tree arg0, tree arg1)
{
const char *p0, *p1;
char c;
switch (fn)
{
case CFN_BUILT_IN_STRSPN:
@ -1409,6 +1410,30 @@ fold_const_call (combined_fn fn, tree type, tree arg0, tree arg1)
}
return NULL_TREE;
case CFN_BUILT_IN_INDEX:
case CFN_BUILT_IN_STRCHR:
if ((p0 = c_getstr (arg0)) && target_char_cst_p (arg1, &c))
{
const char *r = strchr (p0, c);
if (r == NULL)
return build_int_cst (type, 0);
return fold_convert (type,
fold_build_pointer_plus_hwi (arg0, r - p0));
}
return NULL_TREE;
case CFN_BUILT_IN_RINDEX:
case CFN_BUILT_IN_STRRCHR:
if ((p0 = c_getstr (arg0)) && target_char_cst_p (arg1, &c))
{
const char *r = strrchr (p0, c);
if (r == NULL)
return build_int_cst (type, 0);
return fold_convert (type,
fold_build_pointer_plus_hwi (arg0, r - p0));
}
return NULL_TREE;
default:
return fold_const_call_1 (fn, type, arg0, arg1);
}

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2016-12-06 Jakub Jelinek <jakub@redhat.com>
PR c++/71537
* g++.dg/cpp0x/constexpr-strchr.C: New test.
PR tree-optimization/78675
* gcc.c-torture/execute/pr78675.c: New test.
* gcc.target/i386/pr78675-1.c: New test.

27
gcc/testsuite/g++.dg/cpp0x/constexpr-strchr.C Normal file
View File

@ -0,0 +1,27 @@
// { dg-do compile { target c++11 } }
constexpr const char *f1 (const char *p, int q) { return __builtin_strchr (p, q); }
constexpr const char *f2 (const char *p, int q) { return __builtin_index (p, q); }
constexpr const char *f3 (const char *p, int q) { return __builtin_strrchr (p, q); }
constexpr const char *f4 (const char *p, int q) { return __builtin_rindex (p, q); }
constexpr const char a[] = "abcdefedcba";
static_assert (f1 ("abcde", 'f') == nullptr, "");
static_assert (f1 (a, 'g') == nullptr, "");
static_assert (f1 (a, 'f') == a + 5, "");
static_assert (f1 (a, 'c') == a + 2, "");
static_assert (f1 (a, '\0') == a + 11, "");
static_assert (f2 ("abcde", 'f') == nullptr, "");
static_assert (f2 (a, 'g') == nullptr, "");
static_assert (f2 (a, 'f') == a + 5, "");
static_assert (f2 (a, 'c') == a + 2, "");
static_assert (f2 (a, '\0') == a + 11, "");
static_assert (f3 ("abcde", 'f') == nullptr, "");
static_assert (f3 (a, 'g') == nullptr, "");
static_assert (f3 (a, 'f') == a + 5, "");
static_assert (f3 (a, 'c') == a + 8, "");
static_assert (f3 (a, '\0') == a + 11, "");
static_assert (f4 ("abcde", 'f') == nullptr, "");
static_assert (f4 (a, 'g') == nullptr, "");
static_assert (f4 (a, 'f') == a + 5, "");
static_assert (f4 (a, 'c') == a + 8, "");
static_assert (f4 (a, '\0') == a + 11, "");