maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[TableGen] Add error messages 

Print an error instead of crashing in two places.

Differential Revision: https://reviews.llvm.org/D81074
This commit is contained in:
Sebastian Neubauer 2020-05-29 16:35:57 +02:00
parent 5a4d78064e
commit d668d8b619
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/utils/TableGen/SearchableTableEmitter.cpp
View File

@ -119,9 +119,12 @@ private:
return "Intrinsic::" + getIntrinsic(I).EnumName; return "Intrinsic::" + getIntrinsic(I).EnumName;
else if (Field.IsInstruction) else if (Field.IsInstruction)
return I->getAsString(); return I->getAsString();
else if (Field.Enum) else if (Field.Enum) {
return std::string( auto *Entry = Field.Enum->EntryMap[cast<DefInit>(I)->getDef()];
Field.Enum->EntryMap[cast<DefInit>(I)->getDef()]->first); if (!Entry)
PrintFatalError(Twine("Entry for field '") + Field.Name + "' is null");
return std::string(Entry->first);
}
PrintFatalError(Twine("invalid field type for field '") + Field.Name + PrintFatalError(Twine("invalid field type for field '") + Field.Name +
"', expected: string, bits, bit or code"); "', expected: string, bits, bit or code");
} }
@ -596,6 +599,9 @@ void SearchableTableEmitter::collectEnumEntries(
void SearchableTableEmitter::collectTableEntries( void SearchableTableEmitter::collectTableEntries(
GenericTable &Table, const std::vector<Record *> &Items) { GenericTable &Table, const std::vector<Record *> &Items) {
if (Items.empty())
PrintWarning(Twine("Table '") + Table.Name + "' has no items");
for (auto EntryRec : Items) { for (auto EntryRec : Items) {
for (auto &Field : Table.Fields) { for (auto &Field : Table.Fields) {
auto TI = dyn_cast<TypedInit>(EntryRec->getValueInit(Field.Name)); auto TI = dyn_cast<TypedInit>(EntryRec->getValueInit(Field.Name));
@ -624,6 +630,10 @@ void SearchableTableEmitter::collectTableEntries(
Record *IntrinsicClass = Records.getClass("Intrinsic"); Record *IntrinsicClass = Records.getClass("Intrinsic");
Record *InstructionClass = Records.getClass("Instruction"); Record *InstructionClass = Records.getClass("Instruction");
for (auto &Field : Table.Fields) { for (auto &Field : Table.Fields) {
if (!Field.RecType)
PrintFatalError(Twine("Cannot determine type of field '") + Field.Name +
"' in table '" + Table.Name + "'. Maybe it is not used?");
if (auto RecordTy = dyn_cast<RecordRecTy>(Field.RecType)) { if (auto RecordTy = dyn_cast<RecordRecTy>(Field.RecType)) {
if (IntrinsicClass && RecordTy->isSubClassOf(IntrinsicClass)) if (IntrinsicClass && RecordTy->isSubClassOf(IntrinsicClass))
Field.IsIntrinsic = true; Field.IsIntrinsic = true;