From 1024634df7c0121c6a522e3a6695aec1fbcf6eff Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Wed, 29 Jul 2009 16:35:59 +0000 Subject: [PATCH] Fix the verifier to handle intrinsics with LLVMMatchType parameters, where the return type of the intrinsic is not overloaded, i.e., where the type being matched is some other parameter. The argument to LLVMMatchType is an index into the list of overloaded types (ignoring the fixed types), but VerifyIntrinsicPrototype is expecting its arguments for LLVMMatchType parameters to be indices into the combined list of _all_ return values and parameters, not just the overloaded ones. This patch changes TableGen to keep track for each overloaded type of the corresponding index into the list of return values and parameters. It then generates the values expected by VerifyIntrinsicPrototype. llvm-svn: 77467 --- llvm/utils/TableGen/IntrinsicEmitter.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/llvm/utils/TableGen/IntrinsicEmitter.cpp b/llvm/utils/TableGen/IntrinsicEmitter.cpp index f4157bb..d1e9b03 100644 --- a/llvm/utils/TableGen/IntrinsicEmitter.cpp +++ b/llvm/utils/TableGen/IntrinsicEmitter.cpp @@ -304,6 +304,7 @@ void IntrinsicEmitter::EmitVerifier(const std::vector &Ints, const RecPair &ArgTypes = I->first; const std::vector &RetTys = ArgTypes.first; const std::vector &ParamTys = ArgTypes.second; + std::vector OverloadedTypeIndices; OS << " VerifyIntrinsicPrototype(ID, IF, " << RetTys.size() << ", " << ParamTys.size(); @@ -315,6 +316,9 @@ void IntrinsicEmitter::EmitVerifier(const std::vector &Ints, if (ArgType->isSubClassOf("LLVMMatchType")) { unsigned Number = ArgType->getValueAsInt("Number"); + assert(Number < OverloadedTypeIndices.size() && + "Invalid matching number!"); + Number = OverloadedTypeIndices[Number]; if (ArgType->isSubClassOf("LLVMExtendedElementVectorType")) OS << "~(ExtendedElementVectorType | " << Number << ")"; else if (ArgType->isSubClassOf("LLVMTruncatedElementVectorType")) @@ -325,6 +329,9 @@ void IntrinsicEmitter::EmitVerifier(const std::vector &Ints, MVT::SimpleValueType VT = getValueType(ArgType->getValueAsDef("VT")); OS << getEnumName(VT); + if (VT == MVT::iAny || VT == MVT::fAny || VT == MVT::iPTRAny) + OverloadedTypeIndices.push_back(j); + if (VT == MVT::isVoid && j != 0 && j != je - 1) throw "Var arg type not last argument"; } @@ -337,6 +344,9 @@ void IntrinsicEmitter::EmitVerifier(const std::vector &Ints, if (ArgType->isSubClassOf("LLVMMatchType")) { unsigned Number = ArgType->getValueAsInt("Number"); + assert(Number < OverloadedTypeIndices.size() && + "Invalid matching number!"); + Number = OverloadedTypeIndices[Number]; if (ArgType->isSubClassOf("LLVMExtendedElementVectorType")) OS << "~(ExtendedElementVectorType | " << Number << ")"; else if (ArgType->isSubClassOf("LLVMTruncatedElementVectorType")) @@ -347,6 +357,9 @@ void IntrinsicEmitter::EmitVerifier(const std::vector &Ints, MVT::SimpleValueType VT = getValueType(ArgType->getValueAsDef("VT")); OS << getEnumName(VT); + if (VT == MVT::iAny || VT == MVT::fAny || VT == MVT::iPTRAny) + OverloadedTypeIndices.push_back(j + RetTys.size()); + if (VT == MVT::isVoid && j != 0 && j != je - 1) throw "Var arg type not last argument"; } -- 2.7.4