Split the exception object out into its own stack.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64032 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index ce32a45..9d8d3a3 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -97,7 +97,7 @@
struct ObjCEHEntry {
ObjCEHEntry(llvm::BasicBlock *fb, llvm::SwitchInst *fs, llvm::Value *dc)
: FinallyBlock(fb), FinallySwitch(fs),
- DestCode(dc), Exception(0) {}
+ DestCode(dc) {}
/// Entry point to the finally block.
llvm::BasicBlock *FinallyBlock;
@@ -109,12 +109,12 @@
/// Variable holding the code for the destination of a jump
/// through the @finally block.
llvm::Value *DestCode;
-
- /// The exception object being handled, during IR generation for a
- /// @catch block.
- llvm::Value *Exception;
};
+ /// ObjCEHValueStack - Stack of exception objects being handled,
+ /// during IR generation for a @catch block.
+ llvm::SmallVector<llvm::Value*, 8> ObjCEHValueStack;
+
typedef llvm::SmallVector<ObjCEHEntry*, 8> ObjCEHStackType;
ObjCEHStackType ObjCEHStack;