Index: llvm/include/llvm/TableGen/Record.h =================================================================== --- llvm/include/llvm/TableGen/Record.h +++ llvm/include/llvm/TableGen/Record.h @@ -1529,7 +1529,7 @@ // original record. All other fields can be copied normally. Record(const Record &O) : Name(O.Name), Locs(O.Locs), TemplateArgs(O.TemplateArgs), - Values(O.Values), SuperClasses(O.SuperClasses), + Values(O.Values), Assertions(O.Assertions), SuperClasses(O.SuperClasses), TrackedRecords(O.TrackedRecords), ID(LastID++), IsAnonymous(O.IsAnonymous), IsClass(O.IsClass) { } Index: llvm/lib/TableGen/TGParser.cpp =================================================================== --- llvm/lib/TableGen/TGParser.cpp +++ llvm/lib/TableGen/TGParser.cpp @@ -292,6 +292,9 @@ if (Entry.Rec) return AddSubClass(Entry.Rec.get(), SubClass); + if (Entry.Assertion) + return false; + for (auto &E : Entry.Loop->Entries) { if (AddSubClass(E, SubClass)) return true; Index: llvm/test/TableGen/assert.td =================================================================== --- llvm/test/TableGen/assert.td +++ llvm/test/TableGen/assert.td @@ -189,3 +189,18 @@ } defm Rec44 : MC4<"xecret code">; + +// Test a defm in a multiclass that inherits from a class with asserts. + +// CHECK: assertion failed +// CHECK: note: MC5 name must include a space: Ada_Lovelace +// CHECK: assertion failed +// CHECK: note: person age is invalid: 666 + +multiclass MC5 { + assert !ne(!find(name, " "), -1), "MC5 name must include a space: " # name; + + defm _mc5 : MC2, Person; +} + +defm Rec45 : MC5<"secret password", "Ada_Lovelace", 666>;