OSDN Git Service
(root)
/
android-x86
/
external-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61c6ba8
)
revert inadvertant change from previous commit
author
Jim Grosbach
<grosbach@apple.com>
Tue, 1 Sep 2009 17:19:13 +0000
(17:19 +0000)
committer
Jim Grosbach
<grosbach@apple.com>
Tue, 1 Sep 2009 17:19:13 +0000
(17:19 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80689
91177308
-0d34-0410-b5e6-
96231b3b80d8
lib/CodeGen/AsmPrinter/DwarfException.cpp
patch
|
blob
|
history
diff --git
a/lib/CodeGen/AsmPrinter/DwarfException.cpp
b/lib/CodeGen/AsmPrinter/DwarfException.cpp
index
a1fa20e
..
6d6af83
100644
(file)
--- a/
lib/CodeGen/AsmPrinter/DwarfException.cpp
+++ b/
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.