Eli helped me understand how evaluation contexts work.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@113642 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 17 insertions, 7 deletions

diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index f2cf78492c..1c2b343141 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -898,6 +898,10 @@ ExprResult Parser::ParseCastExpression(bool isUnaryExpression,
     if (ExpectAndConsume(tok::l_paren,
                          diag::err_expected_lparen_after, "noexcept"))
       return ExprError();
+    // C++ [expr.unary.noexcept]p1:
+    //   The noexcept operator determines whether the evaluation of its operand,
+    //   which is an unevaluated operand, can throw an exception.
+    EnterExpressionEvaluationContext Unevaluated(Actions, Sema::Unevaluated);
     ExprResult Result = ParseExpression();
     SourceLocation RParen = MatchRHSPunctuation(tok::r_paren, LParen);
     if (!Result.isInvalid())
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 8e29caa6a1..382e9bb185 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -3116,11 +3116,6 @@ CXXMemberCallExpr *Sema::BuildCXXMemberCallExpr(Expr *Exp,
 
 ExprResult Sema::BuildCXXNoexceptExpr(SourceLocation KeyLoc, Expr *Operand,
                                       SourceLocation RParen) {
-  // C++ [expr.unary.noexcept]p1:
-  //   The noexcept operator determines whether the evaluation of its operand,
-  //   which is an unevaluated operand, can throw an exception.
-  ExprEvalContexts.back().Context = Unevaluated;
-
   return Owned(new (Context) CXXNoexceptExpr(Context.BoolTy, Operand,
                                              Operand->CanThrow(Context),
                                              KeyLoc, RParen));
diff --git a/test/CXX/expr/expr.unary/expr.unary.noexcept/cg.cpp b/test/CXX/expr/expr.unary/expr.unary.noexcept/cg.cpp
index c567eff8c3..aa2d553542 100644
--- a/test/CXX/expr/expr.unary/expr.unary.noexcept/cg.cpp
+++ b/test/CXX/expr/expr.unary/expr.unary.noexcept/cg.cpp
@@ -2,14 +2,25 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-pch -o %t-ser.pch -std=c++0x -x c++ %S/ser.h
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -S -emit-llvm -std=c++0x -include-pch %t-ser.pch %s -o - | FileCheck %s
 
+struct D {
+  ~D() throw();
+};
+struct E {
+  ~E() throw();
+};
+
 void test() {
   bool b;
   // CHECK: store i8 1, i8* %b, align 1
   b = noexcept(0);
   // CHECK: store i8 0, i8* %b, align 1
   b = noexcept(throw 0);
-  // CHECK: ret i1 true
   b = f1();
-  // CHECK: ret i1 false
   b = f2();
+
+  // CHECK-NOT: call void @_ZN1ED1Ev
+  // CHECK: call void @_ZN1DD1Ev
+  D(), noexcept(E());
 }
+// CHECK: ret i1 true
+// CHECK: ret i1 false