[PATCH] D41778: Improve diagnostics for instruction mapping
Aleksandar Beserminji via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Jan 8 08:26:51 PST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL322004: [mips] Improve diagnostics for instruction mapping (authored by abeserminji, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D41778?vs=128919&id=128937#toc
Repository:
rL LLVM
https://reviews.llvm.org/D41778
Files:
llvm/trunk/test/TableGen/RelTest.td
llvm/trunk/utils/TableGen/CodeGenMapTable.cpp
Index: llvm/trunk/test/TableGen/RelTest.td
===================================================================
--- llvm/trunk/test/TableGen/RelTest.td
+++ llvm/trunk/test/TableGen/RelTest.td
@@ -0,0 +1,40 @@
+// RUN: not llvm-tblgen -gen-instr-info -I %p/../../include %s 2>&1 | FileCheck %s
+
+// This test verifies that TableGen is displaying an error when mapped instruction
+// does not contain a field listed under RowFields.
+
+include "llvm/Target/Target.td"
+
+class SimpleReg<string n> : Register<n> {
+ let Namespace = "Simple";
+}
+def R0 : SimpleReg<"r0">;
+def SimpleRegClass : RegisterClass<"Simple",[i32],0,(add R0)>;
+def SimpleInstrInfo : InstrInfo;
+
+def SimpleTarget : Target {
+ let InstructionSet = SimpleInstrInfo;
+}
+
+class SimpleRel;
+
+def REL_DEF : InstrMapping {
+ let FilterClass = "SimpleRel";
+ let RowFields = ["BaseName"];
+ let ColFields = ["Col"];
+ let KeyCol = ["KeyCol"];
+ let ValueCols = [["ValCol"]];
+}
+
+class INSTR_DEF : Instruction {
+ let Namespace = "Simple";
+ let OutOperandList = (outs);
+ let InOperandList = (ins);
+ string Basename = "";
+ string Col = "";
+}
+
+def SimpleInstr : SimpleRel, INSTR_DEF;
+
+// CHECK: error: No value "BaseName" found in "SimpleInstr" instruction description.
+// CHECK: def SimpleInstr : SimpleRel, INSTR_DEF;
Index: llvm/trunk/utils/TableGen/CodeGenMapTable.cpp
===================================================================
--- llvm/trunk/utils/TableGen/CodeGenMapTable.cpp
+++ llvm/trunk/utils/TableGen/CodeGenMapTable.cpp
@@ -243,7 +243,12 @@
std::vector<Init*> KeyValue;
ListInit *RowFields = InstrMapDesc.getRowFields();
for (Init *RowField : RowFields->getValues()) {
- Init *CurInstrVal = CurInstr->getValue(RowField)->getValue();
+ RecordVal *RecVal = CurInstr->getValue(RowField);
+ if (RecVal == nullptr)
+ PrintFatalError(CurInstr->getLoc(), "No value " +
+ RowField->getAsString() + " found in \"" +
+ CurInstr->getName() + "\" instruction description.");
+ Init *CurInstrVal = RecVal->getValue();
KeyValue.push_back(CurInstrVal);
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41778.128937.patch
Type: text/x-patch
Size: 2153 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180108/8c95de3a/attachment.bin>
More information about the llvm-commits
mailing list