tbaeder updated this revision to Diff 543266.
tbaeder added a comment.
Always ignore the operand expression.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D155707/new/
https://reviews.llvm.org/D155707
Files:
clang/lib/AST/Interp/ByteCodeExprGen.cpp
clang/lib/AST/Interp/ByteCodeExprGen.h
clang/test/AST/Interp/literals.cpp
clang/test/SemaCXX/cxx0x-noexcept-expression.cpp
Index: clang/test/SemaCXX/cxx0x-noexcept-expression.cpp
===================================================================
--- clang/test/SemaCXX/cxx0x-noexcept-expression.cpp
+++ clang/test/SemaCXX/cxx0x-noexcept-expression.cpp
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++2a %s -fexceptions
-fcxx-exceptions -Wno-unevaluated-expression
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++2a %s -fexceptions
-fcxx-exceptions -Wno-unevaluated-expression
-fexperimental-new-constant-interpreter
void f(); // expected-note {{possible target for call}}
void f(int); // expected-note {{possible target for call}}
Index: clang/test/AST/Interp/literals.cpp
===================================================================
--- clang/test/AST/Interp/literals.cpp
+++ clang/test/AST/Interp/literals.cpp
@@ -1033,3 +1033,25 @@
int array[(long)(char*)0]; // ref-warning {{variable length array folded to
constant array}} \
// expected-warning {{variable length array
folded to constant array}}
}
+
+namespace NE {
+ constexpr int foo() noexcept {
+ return 1;
+ }
+ static_assert(noexcept(foo()), "");
+ constexpr int foo2() {
+ return 1;
+ }
+ static_assert(!noexcept(foo2()), "");
+
+#if __cplusplus > 201402L
+ constexpr int a() {
+ int b = 0;
+ (void)noexcept(++b); // expected-warning {{expression with side effects
has no effect in an unevaluated context}} \
+ // ref-warning {{expression with side effects has no
effect in an unevaluated context}}
+
+ return b;
+ }
+ static_assert(a() == 0, "");
+#endif
+}
Index: clang/lib/AST/Interp/ByteCodeExprGen.h
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.h
+++ clang/lib/AST/Interp/ByteCodeExprGen.h
@@ -102,6 +102,7 @@
bool VisitCXXThrowExpr(const CXXThrowExpr *E);
bool VisitCXXReinterpretCastExpr(const CXXReinterpretCastExpr *E);
bool VisitSourceLocExpr(const SourceLocExpr *E);
+ bool VisitCXXNoexceptExpr(const CXXNoexceptExpr *E);
protected:
bool visitExpr(const Expr *E) override;
Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.cpp
+++ clang/lib/AST/Interp/ByteCodeExprGen.cpp
@@ -1194,6 +1194,15 @@
return true;
}
+template <class Emitter>
+bool ByteCodeExprGen<Emitter>::VisitCXXNoexceptExpr(const CXXNoexceptExpr *E) {
+ assert(E->getType()->isBooleanType());
+
+ if (DiscardResult)
+ return true;
+ return this->emitConstBool(E->getValue(), E);
+}
+
template <class Emitter> bool ByteCodeExprGen<Emitter>::discard(const Expr *E)
{
if (E->containsErrors())
return false;
Index: clang/test/SemaCXX/cxx0x-noexcept-expression.cpp
===================================================================
--- clang/test/SemaCXX/cxx0x-noexcept-expression.cpp
+++ clang/test/SemaCXX/cxx0x-noexcept-expression.cpp
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++2a %s -fexceptions -fcxx-exceptions -Wno-unevaluated-expression
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++2a %s -fexceptions -fcxx-exceptions -Wno-unevaluated-expression -fexperimental-new-constant-interpreter
void f(); // expected-note {{possible target for call}}
void f(int); // expected-note {{possible target for call}}
Index: clang/test/AST/Interp/literals.cpp
===================================================================
--- clang/test/AST/Interp/literals.cpp
+++ clang/test/AST/Interp/literals.cpp
@@ -1033,3 +1033,25 @@
int array[(long)(char*)0]; // ref-warning {{variable length array folded to constant array}} \
// expected-warning {{variable length array folded to constant array}}
}
+
+namespace NE {
+ constexpr int foo() noexcept {
+ return 1;
+ }
+ static_assert(noexcept(foo()), "");
+ constexpr int foo2() {
+ return 1;
+ }
+ static_assert(!noexcept(foo2()), "");
+
+#if __cplusplus > 201402L
+ constexpr int a() {
+ int b = 0;
+ (void)noexcept(++b); // expected-warning {{expression with side effects has no effect in an unevaluated context}} \
+ // ref-warning {{expression with side effects has no effect in an unevaluated context}}
+
+ return b;
+ }
+ static_assert(a() == 0, "");
+#endif
+}
Index: clang/lib/AST/Interp/ByteCodeExprGen.h
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.h
+++ clang/lib/AST/Interp/ByteCodeExprGen.h
@@ -102,6 +102,7 @@
bool VisitCXXThrowExpr(const CXXThrowExpr *E);
bool VisitCXXReinterpretCastExpr(const CXXReinterpretCastExpr *E);
bool VisitSourceLocExpr(const SourceLocExpr *E);
+ bool VisitCXXNoexceptExpr(const CXXNoexceptExpr *E);
protected:
bool visitExpr(const Expr *E) override;
Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.cpp
+++ clang/lib/AST/Interp/ByteCodeExprGen.cpp
@@ -1194,6 +1194,15 @@
return true;
}
+template <class Emitter>
+bool ByteCodeExprGen<Emitter>::VisitCXXNoexceptExpr(const CXXNoexceptExpr *E) {
+ assert(E->getType()->isBooleanType());
+
+ if (DiscardResult)
+ return true;
+ return this->emitConstBool(E->getValue(), E);
+}
+
template <class Emitter> bool ByteCodeExprGen<Emitter>::discard(const Expr *E) {
if (E->containsErrors())
return false;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
