@@ -4273,15 +4273,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
return false;
return true;
- case IF_STMT:
- if (!RECUR (IF_COND (t), rval))
- return false;
- if (!RECUR (THEN_CLAUSE (t), any))
- return false;
- if (!RECUR (ELSE_CLAUSE (t), any))
- return false;
- return true;
-
case DO_STMT:
if (!RECUR (DO_COND (t), rval))
return false;
@@ -4310,8 +4301,8 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
case SWITCH_STMT:
if (!RECUR (SWITCH_STMT_COND (t), rval))
return false;
- if (!RECUR (SWITCH_STMT_BODY (t), any))
- return false;
+ /* FIXME we don't check SWITCH_STMT_BODY currently, because even
+ unreachable labels would be checked. */
return true;
case STMT_EXPR:
@@ -4592,6 +4583,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
return false;
return true;
+ case IF_STMT:
case COND_EXPR:
case VEC_COND_EXPR:
/* If the condition is a known constant, we know which of the legs we
new file mode 100644
@@ -0,0 +1,11 @@
+// { dg-do compile { target c++14 } }
+
+constexpr int *f4(bool b) {
+ if (b) {
+ return nullptr;
+ } else {
+ return new int{42}; // { dg-error "call to non-constexpr" }
+ }
+}
+static_assert(f4(true) == nullptr, "");
+static_assert(f4(false) == nullptr, ""); // { dg-error "non-constant condition" }
new file mode 100644
@@ -0,0 +1,34 @@
+// { dg-do compile { target c++14 } }
+
+constexpr void f1() {
+ if (false)
+ throw;
+}
+
+constexpr void f2() {
+ if (true)
+ throw;
+} // { dg-error "not a constant-expression" }
+
+constexpr void f3() {
+ if (false)
+ ;
+ else
+ throw;
+}// { dg-error "not a constant-expression" }
+
+constexpr void f4() {
+ throw;
+}// { dg-error "not a constant-expression" }
+
+constexpr int fun(int n) {
+ switch (n) {
+ case 0:
+ return 1;
+ default:
+ throw; // { dg-error "not a constant-expression" }
+ }
+}
+
+static_assert(fun(0), "");
+static_assert(fun(1), ""); // { dg-error "non-constant" }