[cfe-commits] r72796 - in /cfe/trunk/lib/CodeGen: CGCXXTemp.cpp CodeGenFunction.h

[Anders Carlsson]

Author: andersca
Date: Wed Jun  3 14:05:16 2009
New Revision: 72796

URL: http://llvm.org/viewvc/llvm-project?rev=72796&view=rev
Log:
More temporary work.

Modified:
    cfe/trunk/lib/CodeGen/CGCXXTemp.cpp
    cfe/trunk/lib/CodeGen/CodeGenFunction.h

Modified: cfe/trunk/lib/CodeGen/CGCXXTemp.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCXXTemp.cpp?rev=72796&r1=72795&r2=72796&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGCXXTemp.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCXXTemp.cpp Wed Jun  3 14:05:16 2009
@@ -17,17 +17,31 @@
 
 void CodeGenFunction::PushCXXTemporary(const CXXTemporary *Temporary, 
                                        llvm::Value *Ptr) {
-  LiveTemporaries.push_back(CXXLiveTemporaryInfo(Temporary, Ptr, 0, 0));
+  llvm::BasicBlock *DtorBlock = createBasicBlock("temp.dtor");
+    
+  LiveTemporaries.push_back(CXXLiveTemporaryInfo(Temporary, Ptr, DtorBlock, 0));
+}
+
+void CodeGenFunction::PopCXXTemporary() {
+  const CXXLiveTemporaryInfo& Info = LiveTemporaries.back();
   
-  // Make a cleanup scope and emit the destructor.
-  {
-    CleanupScope Scope(*this);
-   
-    EmitCXXDestructorCall(Temporary->getDestructor(), Dtor_Complete, Ptr);
-  }
+  CleanupBlockInfo CleanupInfo = PopCleanupBlock();
+  assert(CleanupInfo.CleanupBlock == Info.DtorBlock && 
+         "Cleanup block mismatch!");
+  assert(!CleanupInfo.SwitchBlock && 
+         "Should not have a switch block for temporary cleanup!");
+  assert(!CleanupInfo.EndBlock && 
+         "Should not have an end block for temporary cleanup!");
+  
+  EmitBlock(Info.DtorBlock);
+
+  EmitCXXDestructorCall(Info.Temporary->getDestructor(),
+                        Dtor_Complete, Info.ThisPtr);
+
+  LiveTemporaries.pop_back();
 }
 
-RValue 
+RValue
 CodeGenFunction::EmitCXXExprWithTemporaries(const CXXExprWithTemporaries *E,
                                             llvm::Value *AggLoc,
                                             bool isAggLocVolatile) {

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=72796&r1=72795&r2=72796&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Wed Jun  3 14:05:16 2009
@@ -256,8 +256,8 @@
     llvm::Value *CondPtr;
     
     CXXLiveTemporaryInfo(const CXXTemporary *temporary,
-                         llvm::Value *thisptr, llvm::Value *condptr,
-                         llvm::BasicBlock *dtorblock) 
+                         llvm::Value *thisptr, llvm::BasicBlock *dtorblock,
+                         llvm::Value *condptr)
       : Temporary(temporary), ThisPtr(thisptr), DtorBlock(dtorblock), 
       CondPtr(condptr) { }
   };
@@ -506,6 +506,7 @@
                              llvm::Value *This);
   
   void PushCXXTemporary(const CXXTemporary *Temporary, llvm::Value *Ptr);
+  void PopCXXTemporary();
   
   llvm::Value *EmitCXXNewExpr(const CXXNewExpr *E);