when parsing instructions remember information about the types taken and
returned.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23367 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp
index 8e7569b..dcdbb1c 100644
--- a/utils/TableGen/DAGISelEmitter.cpp
+++ b/utils/TableGen/DAGISelEmitter.cpp
@@ -805,6 +805,7 @@
CodeGenInstruction &CGI = Target.getInstruction(Instrs[i]->getName());
// Check that all of the results occur first in the list.
+ std::vector<MVT::ValueType> ResultTypes;
for (unsigned i = 0; i != NumResults; ++i) {
if (i == CGI.OperandList.size())
I->error("'" + InstResults.begin()->first +
@@ -820,6 +821,9 @@
if (CGI.OperandList[i].Rec != R)
I->error("Operand $" + OpName + " class mismatch!");
+ // Remember the return type.
+ ResultTypes.push_back(CGI.OperandList[i].Ty);
+
// Okay, this one checks out.
InstResults.erase(OpName);
}
@@ -829,6 +833,7 @@
std::map<std::string, TreePatternNode*> InstInputsCheck(InstInputs);
std::vector<TreePatternNode*> ResultNodeOperands;
+ std::vector<MVT::ValueType> OperandTypes;
for (unsigned i = NumResults, e = CGI.OperandList.size(); i != e; ++i) {
const std::string &OpName = CGI.OperandList[i].Name;
if (OpName.empty())
@@ -842,6 +847,7 @@
if (CGI.OperandList[i].Ty != InVal->getType())
I->error("Operand $" + OpName +
"'s type disagrees between the operand and pattern");
+ OperandTypes.push_back(InVal->getType());
// Construct the result for the dest-pattern operand list.
TreePatternNode *OpNode = InVal->clone();
@@ -867,10 +873,8 @@
TreePatternNode *ResultPattern =
new TreePatternNode(I->getRecord(), ResultNodeOperands);
- unsigned NumOperands = CGI.OperandList.size()-NumResults;
-
DEBUG(I->dump());
- Instructions.push_back(DAGInstruction(I, NumResults, NumOperands,
+ Instructions.push_back(DAGInstruction(I, ResultTypes, OperandTypes,
ResultPattern));
}