From: Fariborz Jahanian Date: Tue, 2 Nov 2010 21:05:53 +0000 (+0000) Subject: Fixes an assertion violation when bind to temporary X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8e39236f05b2f71fb2632673948499fd54e2a34;p=clang Fixes an assertion violation when bind to temporary expression is a dependent expression. // rdar: // 8620524 and PR7851 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118066 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h index a0a059ef95..3b8ecf2930 100644 --- a/include/clang/AST/ExprCXX.h +++ b/include/clang/AST/ExprCXX.h @@ -672,8 +672,9 @@ class CXXBindTemporaryExpr : public Expr { Stmt *SubExpr; - CXXBindTemporaryExpr(CXXTemporary *temp, Expr* subexpr) - : Expr(CXXBindTemporaryExprClass, subexpr->getType(), false, false), + CXXBindTemporaryExpr(CXXTemporary *temp, Expr* subexpr, + bool TD=false, bool VD=false) + : Expr(CXXBindTemporaryExprClass, subexpr->getType(), TD, VD), Temp(temp), SubExpr(subexpr) { } public: diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp index 05b6fc1f6c..a07d7840f0 100644 --- a/lib/AST/ExprCXX.cpp +++ b/lib/AST/ExprCXX.cpp @@ -534,7 +534,9 @@ CXXBindTemporaryExpr *CXXBindTemporaryExpr::Create(ASTContext &C, assert(SubExpr->getType()->isRecordType() && "Expression bound to a temporary must have record type!"); - return new (C) CXXBindTemporaryExpr(Temp, SubExpr); + return new (C) CXXBindTemporaryExpr(Temp, SubExpr, + SubExpr->isTypeDependent(), + SubExpr->isValueDependent()); } CXXTemporaryObjectExpr::CXXTemporaryObjectExpr(ASTContext &C, diff --git a/test/CodeGenCXX/template-dependent-bind-temporary.cpp b/test/CodeGenCXX/template-dependent-bind-temporary.cpp new file mode 100644 index 0000000000..cc1ce866fe --- /dev/null +++ b/test/CodeGenCXX/template-dependent-bind-temporary.cpp @@ -0,0 +1,24 @@ +// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s +// rdar: //8620524 +// PR7851 +struct string { + string (const string& ); + string (); + ~string(); +}; + +string operator + (char ch, const string&); + +template +void IntToString(T a) +{ + string result; + T digit; + char((digit < 10 ? '0' : 'a') + digit) + result; +} + +int main() { +// CHECK: define linkonce_odr void @_Z11IntToStringIcEvT_( + IntToString('a'); +} +