diff options
| author | Chris Lattner <sabre@nondot.org> | 2003-08-28 19:56:10 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2003-08-28 19:56:10 +0000 |
| commit | fd04561e1b21f41b3c03cae4481f1d45f699c6de (patch) | |
| tree | b3d2b485b4dbdf19673fa1b54f667811ee125a41 /lib | |
| parent | 3b6b6ba4be1fc67809e81f750f664363f947aa1c (diff) | |
| download | llvm-fd04561e1b21f41b3c03cae4481f1d45f699c6de.tar.gz llvm-fd04561e1b21f41b3c03cae4481f1d45f699c6de.tar.bz2 llvm-fd04561e1b21f41b3c03cae4481f1d45f699c6de.tar.xz | |
Fix really nasty bugs in the CWriter, handling invoke instructions. Tracking
these down was NOT phun.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8181 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/CBackend/CBackend.cpp | 7 | ||||
| -rw-r--r-- | lib/Target/CBackend/Writer.cpp | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index a622075141..721ead091c 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -894,7 +894,8 @@ void CWriter::printFunction(Function *F) { UI != UE; ++UI) if (TerminatorInst *TI = dyn_cast<TerminatorInst>(*UI)) if (TI != Prev->getTerminator() || - isa<SwitchInst>(Prev->getTerminator())) { + isa<SwitchInst>(Prev->getTerminator()) || + isa<InvokeInst>(Prev->getTerminator())) { NeedsLabel = true; break; } @@ -968,6 +969,8 @@ void CWriter::visitInvokeInst(InvokeInst &II) { Out << " }\n" << " __llvm_jmpbuf_list = &Entry;\n" << " "; + + if (II.getType() != Type::VoidTy) outputLValue(&II); visitCallSite(&II); Out << ";\n" << " __llvm_jmpbuf_list = Entry.next;\n" @@ -998,7 +1001,7 @@ void CWriter::printBranchToBlock(BasicBlock *CurBB, BasicBlock *Succ, Out << "; /* for PHI node */\n"; } - if (CurBB->getNext() != Succ) { + if (CurBB->getNext() != Succ || isa<InvokeInst>(CurBB->getTerminator())) { Out << std::string(Indent, ' ') << " goto "; writeOperand(Succ); Out << ";\n"; diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp index a622075141..721ead091c 100644 --- a/lib/Target/CBackend/Writer.cpp +++ b/lib/Target/CBackend/Writer.cpp @@ -894,7 +894,8 @@ void CWriter::printFunction(Function *F) { UI != UE; ++UI) if (TerminatorInst *TI = dyn_cast<TerminatorInst>(*UI)) if (TI != Prev->getTerminator() || - isa<SwitchInst>(Prev->getTerminator())) { + isa<SwitchInst>(Prev->getTerminator()) || + isa<InvokeInst>(Prev->getTerminator())) { NeedsLabel = true; break; } @@ -968,6 +969,8 @@ void CWriter::visitInvokeInst(InvokeInst &II) { Out << " }\n" << " __llvm_jmpbuf_list = &Entry;\n" << " "; + + if (II.getType() != Type::VoidTy) outputLValue(&II); visitCallSite(&II); Out << ";\n" << " __llvm_jmpbuf_list = Entry.next;\n" @@ -998,7 +1001,7 @@ void CWriter::printBranchToBlock(BasicBlock *CurBB, BasicBlock *Succ, Out << "; /* for PHI node */\n"; } - if (CurBB->getNext() != Succ) { + if (CurBB->getNext() != Succ || isa<InvokeInst>(CurBB->getTerminator())) { Out << std::string(Indent, ' ') << " goto "; writeOperand(Succ); Out << ";\n"; |