Only compute intrinsic valuetypes when in a target .td file.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27197 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/CodeGenIntrinsics.h b/utils/TableGen/CodeGenIntrinsics.h
index f986ed1..4bae8f1 100644
--- a/utils/TableGen/CodeGenIntrinsics.h
+++ b/utils/TableGen/CodeGenIntrinsics.h
@@ -34,7 +34,10 @@
/// of the arguments. These are things like Type::UIntTyID.
std::vector<std::string> ArgTypes;
- /// ArgVTs - The MVT::ValueType for each argument type.
+ /// ArgVTs - The MVT::ValueType for each argument type. Note that this list
+ /// is only populated when in the context of a target .td file. When
+ /// building Intrinsics.td, this isn't available, because we don't know the
+ /// target pointer size.
std::vector<MVT::ValueType> ArgVTs;
/// ArgTypeDefs - The records for each argument type.
diff --git a/utils/TableGen/CodeGenTarget.cpp b/utils/TableGen/CodeGenTarget.cpp
index e8c1335..f9bae9f 100644
--- a/utils/TableGen/CodeGenTarget.cpp
+++ b/utils/TableGen/CodeGenTarget.cpp
@@ -362,8 +362,17 @@
std::vector<Record*> I = RC.getAllDerivedDefinitions("Intrinsic");
std::vector<CodeGenIntrinsic> Result;
+
+ // If we are in the context of a target .td file, get the target info so that
+ // we can decode the current intptr_t.
+ CodeGenTarget *CGT = 0;
+ if (Records.getClass("Target") &&
+ Records.getAllDerivedDefinitions("Target").size() == 1)
+ CGT = new CodeGenTarget();
+
for (unsigned i = 0, e = I.size(); i != e; ++i)
- Result.push_back(CodeGenIntrinsic(I[i], 0));
+ Result.push_back(CodeGenIntrinsic(I[i], CGT));
+ delete CGT;
return Result;
}
@@ -414,7 +423,8 @@
assert(TyEl->isSubClassOf("LLVMType") && "Expected a type!");
ArgTypes.push_back(TyEl->getValueAsString("TypeVal"));
- ArgVTs.push_back(getValueType(TyEl->getValueAsDef("VT"), 0));
+ if (CGT)
+ ArgVTs.push_back(getValueType(TyEl->getValueAsDef("VT"), CGT));
ArgTypeDefs.push_back(TyEl);
}
if (ArgTypes.size() == 0)