This is an archive of the discontinued LLVM Phabricator instance.

Differential D59294

[TableGen] Give meaningful msg for def use in multiclass
ClosedPublic

Authored by javed.absar on Mar 13 2019, 4:52 AM.

Details

Reviewers
nhaehnle
simon_tatham
hfinkel
eli.friedman
Commits
rG33888ff66b19: [TableGen] Give meaningful msg for def use in multiclass
rL356985: [TableGen] Give meaningful msg for def use in multiclass
Summary

When one mistakenly specifies 'def' instead of using 'defm', the error message presently is quite misleading: 'Couldn't find class..'

This patch makes it more clear in case the multiclass of same name does actually exist.

Diff Detail

Repository
rL LLVM

Event Timeline

javed.absar created this revision.Mar 13 2019, 4:52 AM
javed.absar added a comment.Mar 14 2019, 4:37 AM

ping!

hfinkel accepted this revision.Mar 14 2019, 8:53 AM

LGTM.

This revision is now accepted and ready to land.Mar 14 2019, 8:53 AM
Closed by commit rL356985: [TableGen] Give meaningful msg for def use in multiclass (authored by javed.absar). · Explain WhyMar 26 2019, 3:47 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptMar 26 2019, 3:47 AM

Revision Contents

PathSize
llvm/
trunk/
lib/
TableGen/
10 lines
test/
TableGen/
10 lines

Diff 192253

llvm/trunk/lib/TableGen/TGParser.cpp

Show First 20 Lines • Show All 530 Lines • ▼ Show 20 Lines
/// ///
Record *TGParser::ParseClassID() { Record *TGParser::ParseClassID() {
if (Lex.getCode() != tgtok::Id) { if (Lex.getCode() != tgtok::Id) {
TokError("expected name for ClassID"); TokError("expected name for ClassID");
return nullptr; return nullptr;
} }
Record *Result = Records.getClass(Lex.getCurStrVal()); Record *Result = Records.getClass(Lex.getCurStrVal());
if (!Result) if (!Result) {
TokError("Couldn't find class '" + Lex.getCurStrVal() + "'"); std::string Msg("Couldn't find class '" + Lex.getCurStrVal() + "'");
if (MultiClasses[Lex.getCurStrVal()].get())
TokError(Msg + ". Use 'defm' if you meant to use multiclass '" +
Lex.getCurStrVal() + "'");
else
TokError(Msg);
}
Lex.Lex(); Lex.Lex();
return Result; return Result;
} }
/// ParseMultiClassID - Parse and resolve a reference to a multiclass name. /// ParseMultiClassID - Parse and resolve a reference to a multiclass name.
/// This returns null on error. /// This returns null on error.
/// ///
▲ Show 20 Lines • Show All 2,627 Lines • Show Last 20 Lines

llvm/trunk/test/TableGen/MultiClass-def-fail.td

// RUN: not llvm-tblgen %s 2>&1 | FileCheck %s
// XFAIL: vg_leak
// This test checks that using def instead of defm gives a meaningful error
multiclass M2 {
def X;
}
// CHECK: error: Couldn't find class 'M2'. Use 'defm' if you meant to use multiclass 'M2'
def rec1 : M2;