From: Dan Gohman Date: Tue, 22 Jul 2008 00:36:48 +0000 (+0000) Subject: Fix multiple-return-value-to-first-class-aggregates autoupgrade to X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ceab39f0b7d36c3bdc8c62b203a8def132c745c1;p=oota-llvm.git Fix multiple-return-value-to-first-class-aggregates autoupgrade to correctly handle the case where multiple-return-value constructs were used to return one or zero values. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53890 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/VMCore/AutoUpgrade.cpp b/lib/VMCore/AutoUpgrade.cpp index c2c19c45e4c..fd7d6dcd4c2 100644 --- a/lib/VMCore/AutoUpgrade.cpp +++ b/lib/VMCore/AutoUpgrade.cpp @@ -420,12 +420,15 @@ void llvm::UpgradeCallsToIntrinsic(Function* F) { /// function to use aggregate return values built with insertvalue /// instructions. void llvm::UpgradeMultipleReturnValues(Function *CurrentFunction) { + const Type *ReturnType = CurrentFunction->getReturnType(); for (Function::iterator I = CurrentFunction->begin(), E = CurrentFunction->end(); I != E; ++I) { BasicBlock *BB = I; if (ReturnInst *RI = dyn_cast(BB->getTerminator())) { unsigned NumVals = RI->getNumOperands(); - if (NumVals > 1) { + if (NumVals > 1 || + (isa(ReturnType) && + (NumVals == 0 || RI->getOperand(0)->getType() != ReturnType))) { std::vector Types(NumVals); for (unsigned i = 0; i != NumVals; ++i) Types[i] = RI->getOperand(i)->getType();