diff options
| author | David Greene <greened@obbligato.org> | 2007-08-27 19:04:21 +0000 |
|---|---|---|
| committer | David Greene <greened@obbligato.org> | 2007-08-27 19:04:21 +0000 |
| commit | f1355a55f8d815f5385e9a4432195f03b65f3a42 (patch) | |
| tree | 22a84137e3fd97e2796d08dd07436bf2f4ff566c /tools | |
| parent | 44c8265cf86ba3cfc317605726296474aa8d7fa6 (diff) | |
Update InvokeInst to work like CallInst
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41506 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llvm-upgrade/UpgradeParser.y | 5 | ||||
| -rw-r--r-- | tools/llvm2cpp/CppWriter.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/llvm-upgrade/UpgradeParser.y b/tools/llvm-upgrade/UpgradeParser.y index 251cc77ded..5893fcd5cc 100644 --- a/tools/llvm-upgrade/UpgradeParser.y +++ b/tools/llvm-upgrade/UpgradeParser.y @@ -3342,7 +3342,8 @@ BBTerminatorInst // Create the call node... if (!$6) { // Has no arguments? - $$.TI = new InvokeInst(V, Normal, Except, 0, 0); + std::vector<Value*> Args; + $$.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified // correctly! @@ -3362,7 +3363,7 @@ BBTerminatorInst if (I != E || (ArgI != ArgE && !Ty->isVarArg())) error("Invalid number of parameters detected"); - $$.TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size()); + $$.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } cast<InvokeInst>($$.TI)->setCallingConv(upgradeCallingConv($2)); delete $3.PAT; diff --git a/tools/llvm2cpp/CppWriter.cpp b/tools/llvm2cpp/CppWriter.cpp index 1cba7578bc..99d79def01 100644 --- a/tools/llvm2cpp/CppWriter.cpp +++ b/tools/llvm2cpp/CppWriter.cpp @@ -1083,8 +1083,7 @@ CppWriter::printInstruction(const Instruction *I, const std::string& bbname) { << opNames[0] << ", " << opNames[1] << ", " << opNames[2] << ", " - << "&" << iName << "_params[0], " << inv->getNumOperands() - 3 - << ", \""; + << iName << "_params.begin(), " << iName << "_params.end(), \""; printEscapedString(inv->getName()); Out << "\", " << bbname << ");"; nl(Out) << iName << "->setCallingConv("; |