commit aedb46fe217b41200e9c75cca2cbd65499841a36
author Anders Carlsson <andersca@mac.com> Mon Sep 14 01:30:44 2009 +0000
committer Anders Carlsson <andersca@mac.com> Mon Sep 14 01:30:44 2009 +0000
tree 644093f9cdd1411b359fc7b5a2b648d133f83483
parent f3f93aea7538d08c7b6e1ba7dd00a346a757f061

If a function call returns a reference, don't bind it to a temporary.

llvm-svn: 81743

clang/lib/CodeGen/CGCXXTemp.cpp

diff --git a/clang/lib/CodeGen/CGCXXTemp.cpp b/clang/lib/CodeGen/CGCXXTemp.cpp
index 177c6db..4768556 100644
--- a/clang/lib/CodeGen/CGCXXTemp.cpp
+++ b/clang/lib/CodeGen/CGCXXTemp.cpp
@@ -54,7 +54,13 @@
   assert(!CleanupInfo.EndBlock &&
          "Should not have an end block for temporary cleanup!");
 
-  EmitBlock(Info.DtorBlock);
+  llvm::BasicBlock *CurBB = Builder.GetInsertBlock();
+  if (CurBB && !CurBB->getTerminator() &&
+      Info.DtorBlock->getNumUses() == 0) {
+    CurBB->getInstList().splice(CurBB->end(), Info.DtorBlock->getInstList());
+    delete Info.DtorBlock;
+  } else
+    EmitBlock(Info.DtorBlock);
 
   llvm::BasicBlock *CondEnd = 0;