diff --git a/gcc/cp/call.c b/gcc/cp/call.c index b00334d0919..123f06b1f2b 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -6083,6 +6083,15 @@ op_is_ordered (tree_code code) case LSHIFT_EXPR: // 8. a >> b case RSHIFT_EXPR: + // a && b + // Predates P0145R3. + case TRUTH_ANDIF_EXPR: + // a || b + // Predates P0145R3. + case TRUTH_ORIF_EXPR: + // a , b + // Predates P0145R3. + case COMPOUND_EXPR: return (flag_strong_eval_order ? 1 : 0); default: diff --git a/gcc/testsuite/g++.dg/cpp1z/eval-order10.C b/gcc/testsuite/g++.dg/cpp1z/eval-order10.C new file mode 100644 index 00000000000..02719b7e810 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/eval-order10.C @@ -0,0 +1,27 @@ +// PR c++/82959 +// { dg-do run } +// { dg-additional-options -fstrong-eval-order } + +struct A {}; + +void operator && (const A x, const A) {} +void operator || (const A x, const A) {} +void operator , (const A x, const A) {} + +int i; + +A f () { if (i != 0) __builtin_abort (); i = 1; return A (); } +A g () { if (i != 1) __builtin_abort (); i = 2; return A (); } + +int +main () +{ + f () && g (); + if (i != 2) __builtin_abort (); + i = 0; + f () || g (); + if (i != 2) __builtin_abort (); + i = 0; + f (), g (); + if (i != 2) __builtin_abort (); +}