commit dde0a94120915fa925d1ffcdb997c7b44dc9fa21
author Anders Carlsson <andersca@mac.com> Thu Sep 11 09:15:33 2008 +0000
committer Anders Carlsson <andersca@mac.com> Thu Sep 11 09:15:33 2008 +0000
tree 6d31f03f931031e2eb3a5d4cd163b02e2a35bdba
parent 1452f5599d4de1d97a71ad61786126b91da9da69

Make sure to store the exception in the catch parameter.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56102 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGObjCMac.cpp

diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index d1875ac..2cda9d5 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -1442,16 +1442,18 @@
     // Handle catch list
     for (; CatchStmt; CatchStmt = CatchStmt->getNextCatchStmt()) {
       llvm::BasicBlock *NextCatchBlock = llvm::BasicBlock::Create("nextcatch");
+      llvm::Value *Caught = CGF.Builder.CreateLoad(CaughtPtr, "caught");
 
       QualType T;
       bool MatchesAll = false;
-      
+      const DeclStmt *CatchParam = 
+        cast_or_null<DeclStmt>(CatchStmt->getCatchParamStmt());
+
       // catch(...) always matches.
-      if (CatchStmt->hasEllipsis())
+      if (!CatchParam)
         MatchesAll = true;
       else {
-        const DeclStmt *DS = cast<DeclStmt>(CatchStmt->getCatchParamStmt());
-        QualType PT = cast<ValueDecl>(DS->getDecl())->getType();
+        QualType PT = cast<ValueDecl>(CatchParam->getDecl())->getType();
         T = PT->getAsPointerType()->getPointeeType();
         
         // catch(id e) always matches.
@@ -1460,10 +1462,18 @@
       }
       
       if (MatchesAll) {   
-        CGF.EmitStmt(CatchStmt);
+        if (CatchParam) {
+          CGF.EmitStmt(CatchParam);
+          
+          const VarDecl *VD = cast<VarDecl>(CatchParam->getDecl());
+          
+          llvm::Value *V = CGF.GetAddrOfLocalVar(VD);
+          
+          CGF.Builder.CreateStore(Caught, V);
+        }
         
+        CGF.EmitStmt(CatchStmt->getCatchBody());
         CGF.Builder.CreateBr(FinallyBlock);
-        
         CGF.EmitBlock(NextCatchBlock);        
         break;
       }
@@ -1474,7 +1484,6 @@
       // Check if the @catch block matches the exception object.
       llvm::Value *Class = EmitClassRef(CGF.Builder, ObjCType->getDecl());
       
-      llvm::Value *Caught = CGF.Builder.CreateLoad(CaughtPtr, "caught");
       llvm::Value *Match = CGF.Builder.CreateCall2(ObjCTypes.ExceptionMatchFn,
                                                    Class, Caught, "match");
                                                    
@@ -1486,7 +1495,18 @@
       
       // Emit the @catch block.
       CGF.EmitBlock(MatchedBlock);
-      CGF.EmitStmt(CatchStmt);
+      if (CatchParam) {
+        CGF.EmitStmt(CatchParam);
+        
+        const VarDecl *VD = cast<VarDecl>(CatchParam->getDecl());
+        
+        llvm::Value *Tmp = 
+          CGF.Builder.CreateBitCast(Caught, CGF.ConvertType(VD->getType()), 
+                                    "tmp");
+        CGF.Builder.CreateStore(Tmp, CGF.GetAddrOfLocalVar(VD));
+      }
+      
+      CGF.EmitStmt(CatchStmt->getCatchBody());
       CGF.Builder.CreateBr(FinallyBlock);
       
       CGF.EmitBlock(NextCatchBlock);