From a8540819dfbf51da44f5366177f730ad58823070 Mon Sep 17 00:00:00 2001 From: Manman Ren Date: Tue, 26 Mar 2013 18:29:15 +0000 Subject: Fix uninitialized read of CalleeWithThisReturn. Initialize CalleeWithThisReturn to 0 in the constructor. Also revert r170815 since checking CalleeWithThisReturn is faster. PR15598 llvm-svn: 178053 --- clang/lib/CodeGen/CGCall.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/lib/CodeGen/CGCall.cpp') diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index 1fb88b009f4..faf32e30083 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -1722,7 +1722,7 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI) { // the same object as CXXThisValue, use the return value from the CallInst. // We will not need to keep 'this' alive through the callsite. It also enables // optimizations in the backend, such as tail call optimization. - if (CGM.getCXXABI().HasThisReturn(CurGD) && CalleeWithThisReturn) { + if (CalleeWithThisReturn && CGM.getCXXABI().HasThisReturn(CurGD)) { llvm::BasicBlock *IP = Builder.GetInsertBlock(); llvm::CallInst *Callsite; if (!IP->empty() && (Callsite = dyn_cast(&IP->back())) && -- cgit v1.2.3