6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

Print out the location of expanded multiclass defs in TableGen errors.

Browse Source 
When reporting an error for a defm, we would previously only report the
location of the outer defm, which is not always where the error is.

Now we also print the location of the expanded multiclass defs:

lib/Target/X86/X86InstrSSE.td:2902:12: error: foo
  defm ADD : basic_sse12_fp_binop_s<0x58, "add", fadd, SSE_ALU_ITINS_S>,
             ^
lib/Target/X86/X86InstrSSE.td:2801:11: note: instantiated from multiclass
  defm PD : sse12_fp_packed<opc, !strconcat(OpcodeStr, "pd"), OpNode, VR128,
            ^
lib/Target/X86/X86InstrSSE.td:194:5: note: instantiated from multiclass
    def rm : PI<opc, MRMSrcMem, (outs RC:$dst), (ins RC:$src1, x86memop:$src2),
        ^

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162409 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen
2012-08-22 23:33:58 +00:00
parent 6c6237f8dc
commit 376a8a773e
8 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/TableGen/Error.h
View File

@@ -20,21 +20,22 @@
namespace llvm {
class TGError {
SMLoc Loc;
SmallVector<SMLoc, 4> Locs;
std::string Message;
public:
TGError(SMLoc loc, const std::string &message) : Loc(loc), Message(message) {}
TGError(ArrayRef<SMLoc> locs, const std::string &message)
: Locs(locs.begin(), locs.end()), Message(message) {}
SMLoc getLoc() const { return Loc; }
ArrayRef<SMLoc> getLoc() const { return Locs; }
const std::string &getMessage() const { return Message; }
};
void PrintWarning(SMLoc WarningLoc, const Twine &Msg);
void PrintWarning(ArrayRef<SMLoc> WarningLoc, const Twine &Msg);
void PrintWarning(const char *Loc, const Twine &Msg);
void PrintWarning(const Twine &Msg);
void PrintWarning(const TGError &Warning);
void PrintError(SMLoc ErrorLoc, const Twine &Msg);
void PrintError(ArrayRef<SMLoc> ErrorLoc, const Twine &Msg);
void PrintError(const char *Loc, const Twine &Msg);
void PrintError(const Twine &Msg);
void PrintError(const TGError &Error);

18
include/llvm/TableGen/Record.h
View File

@@ -1301,7 +1301,9 @@ class Record {
// Unique record ID.
unsigned ID;
Init *Name;
SMLoc Loc;
// Location where record was instantiated, followed by the location of
// multiclass prototypes used.
SmallVector<SMLoc, 4> Locs;
std::vector<Init *> TemplateArgs;
std::vector<RecordVal> Values;
std::vector<Record*> SuperClasses;
@@ -1317,13 +1319,15 @@ class Record {
public:
// Constructs a record.
explicit Record(const std::string &N, SMLoc loc, RecordKeeper &records) :
ID(LastID++), Name(StringInit::get(N)), Loc(loc), TrackedRecords(records),
TheInit(0) {
explicit Record(const std::string &N, ArrayRef<SMLoc> locs,
RecordKeeper &records) :
ID(LastID++), Name(StringInit::get(N)), Locs(locs.begin(), locs.end()),
TrackedRecords(records), TheInit(0) {
init();
}
explicit Record(Init *N, SMLoc loc, RecordKeeper &records) :
ID(LastID++), Name(N), Loc(loc), TrackedRecords(records), TheInit(0) {
explicit Record(Init *N, ArrayRef<SMLoc> locs, RecordKeeper &records) :
ID(LastID++), Name(N), Locs(locs.begin(), locs.end()),
TrackedRecords(records), TheInit(0) {
init();
}
~Record() {}
@@ -1345,7 +1349,7 @@ public:
void setName(Init *Name); // Also updates RecordKeeper.
void setName(const std::string &Name); // Also updates RecordKeeper.
SMLoc getLoc() const { return Loc; }
ArrayRef<SMLoc> getLoc() const { return Locs; }
/// get the corresponding DefInit.
DefInit *getDefInit();