From 9ee5ee84f0ad8246bff105786a128c7a909fdf12 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 21 Oct 2010 16:21:08 +0000 Subject: [PATCH] When checking whether a return statement returns a stack-local variable, handle conditional operators involving a throw-expression. Fixes GCC DejaGNU's g++.dg/template/cond4.C. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@117027 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaChecking.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index fccbe92d6f..4ed39e2a4b 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -1923,11 +1923,18 @@ static DeclRefExpr* EvalAddr(Expr *E) { ConditionalOperator *C = cast(E); // Handle the GNU extension for missing LHS. - if (Expr *lhsExpr = C->getLHS()) - if (DeclRefExpr* LHS = EvalAddr(lhsExpr)) - return LHS; + if (Expr *lhsExpr = C->getLHS()) { + // In C++, we can have a throw-expression, which has 'void' type. + if (!lhsExpr->getType()->isVoidType()) + if (DeclRefExpr* LHS = EvalAddr(lhsExpr)) + return LHS; + } + + // In C++, we can have a throw-expression, which has 'void' type. + if (C->getRHS()->getType()->isVoidType()) + return NULL; - return EvalAddr(C->getRHS()); + return EvalAddr(C->getRHS()); } // For casts, we need to handle conversions from arrays to -- 2.40.0