diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/call.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/delayedfold/builtin1.C | 11 |
3 files changed, 15 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fc846dc..0ad384a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2016-01-15 Jason Merrill <jason@redhat.com> + PR c++/68847 + * call.c (build_cxx_call): Use fold_non_dependent_expr. + * typeck2.c (cxx_incomplete_type_diagnostic): Use the location of value. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index c05170a..ce87be7 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -7755,7 +7755,7 @@ build_cxx_call (tree fn, int nargs, tree *argarray, /* We need to take care that values to BUILT_IN_NORMAL are reduced. */ for (i = 0; i < nargs; i++) - argarray[i] = maybe_constant_value (argarray[i]); + argarray[i] = fold_non_dependent_expr (argarray[i]); if (!check_builtin_function_arguments (fndecl, nargs, argarray)) return error_mark_node; diff --git a/gcc/testsuite/g++.dg/delayedfold/builtin1.C b/gcc/testsuite/g++.dg/delayedfold/builtin1.C new file mode 100644 index 0000000..32f4435 --- /dev/null +++ b/gcc/testsuite/g++.dg/delayedfold/builtin1.C @@ -0,0 +1,11 @@ +// PR c++/68847 +// { dg-do compile { target cas_int } } + +class RegionLock { + template <unsigned long> void m_fn1(); + int spinlock; +} acquire_zero; +int acquire_one; +template <unsigned long> void RegionLock::m_fn1() { + __atomic_compare_exchange(&spinlock, &acquire_zero, &acquire_one, false, 2, 2); +} |