Fixed incorrect assertion: spill code for function ptr should be

handled like normal operands, not like other call arguments.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3967 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index 6092053135e2c92658230657e7c8d5d9fb4d7688..bd87ec91aad6f4e67a17b52141fe41dfcd80aaf3 100644 (file)
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -592,9 +592,10 @@ void PhyRegAlloc::insertCode4SpilledLR(const LiveRange *LR,
                                       const BasicBlock *BB,
                                       const unsigned OpNum) {
 
-  assert(! TM.getInstrInfo().isCall(MInst->getOpCode()) &&
-        (! TM.getInstrInfo().isReturn(MInst->getOpCode())) &&
-        "Arg of a call/ret must be handled elsewhere");
+  assert((! TM.getInstrInfo().isCall(MInst->getOpCode()) || OpNum == 0) &&
+         "Outgoing arg of a call must be handled elsewhere (func arg ok)");
+  assert(! TM.getInstrInfo().isReturn(MInst->getOpCode()) &&
+        "Return value of a ret must be handled elsewhere");
 
   MachineOperand& Op = MInst->getOperand(OpNum);
   bool isDef =  MInst->operandIsDefined(OpNum);

diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
index 6092053135e2c92658230657e7c8d5d9fb4d7688..bd87ec91aad6f4e67a17b52141fe41dfcd80aaf3 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
@@ -592,9 +592,10 @@ void PhyRegAlloc::insertCode4SpilledLR(const LiveRange *LR,
                                       const BasicBlock *BB,
                                       const unsigned OpNum) {
 
-  assert(! TM.getInstrInfo().isCall(MInst->getOpCode()) &&
-        (! TM.getInstrInfo().isReturn(MInst->getOpCode())) &&
-        "Arg of a call/ret must be handled elsewhere");
+  assert((! TM.getInstrInfo().isCall(MInst->getOpCode()) || OpNum == 0) &&
+         "Outgoing arg of a call must be handled elsewhere (func arg ok)");
+  assert(! TM.getInstrInfo().isReturn(MInst->getOpCode()) &&
+        "Return value of a ret must be handled elsewhere");
 
   MachineOperand& Op = MInst->getOperand(OpNum);
   bool isDef =  MInst->operandIsDefined(OpNum);