diff options
| author | Jim Grosbach <grosbach@apple.com> | 2009-09-01 17:19:13 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2009-09-01 17:19:13 +0000 |
| commit | 5afbf2b541ffa21587ebc9bad6d847930db89406 (patch) | |
| tree | 3e8ac04190249d8952699c427e8fdb57ec2f4d98 /llvm/lib/CodeGen | |
| parent | 95908b373a61382b35f15666ba58ba9c535bf00b (diff) | |
| download | bcm5719-llvm-5afbf2b541ffa21587ebc9bad6d847930db89406.tar.gz bcm5719-llvm-5afbf2b541ffa21587ebc9bad6d847930db89406.zip | |
revert inadvertant change from previous commit
llvm-svn: 80689
Diffstat (limited to 'llvm/lib/CodeGen')
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp index a1fa20e07f1..6d6af83bd27 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp @@ -459,8 +459,9 @@ ComputeCallSiteTable(SmallVectorImpl<CallSiteEntry> &CallSites, FirstActions[P.PadIndex] }; - // Try to merge with the previous call-site. - if (PreviousIsInvoke) { + // Try to merge with the previous call-site. SJLJ doesn't do this + if (PreviousIsInvoke && + MAI->getExceptionHandlingType() == ExceptionHandling::Dwarf) { CallSiteEntry &Prev = CallSites.back(); if (Site.PadLabel == Prev.PadLabel && Site.Action == Prev.Action) { // Extend the range of the previous entry. |
