replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM IAS: allow more depth in contextual diagnostics 

Switch the context to be SmallVectors.  This allows for saving additional
context when providing previous emission sites.

llvm-svn: 198665
This commit is contained in:
Saleem Abdulrasool 2014-01-07 02:29:00 +00:00
parent c493d1499a
commit 4cb063cbf0
2 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -116,46 +116,56 @@ typedef MapVector<const MCSection *, ConstantPool> ConstantPoolMapTy;
class UnwindContext {
MCAsmParser &Parser;
SMLoc FnStartLoc;
SMLoc CantUnwindLoc;
SMLoc PersonalityLoc;
SMLoc HandlerDataLoc;
typedef SmallVector<SMLoc, 4> Locs;
Locs FnStartLocs;
Locs CantUnwindLocs;
Locs PersonalityLocs;
Locs HandlerDataLocs;
int FPReg;
public:
UnwindContext(MCAsmParser &P) : Parser(P), FPReg(-1) {}
bool hasFnStart() const { return FnStartLoc.isValid(); }
bool cantUnwind() const { return CantUnwindLoc.isValid(); }
bool hasHandlerData() const { return HandlerDataLoc.isValid(); }
bool hasPersonality() const { return PersonalityLoc.isValid(); }
bool hasFnStart() const { return !FnStartLocs.empty(); }
bool cantUnwind() const { return !CantUnwindLocs.empty(); }
bool hasHandlerData() const { return !HandlerDataLocs.empty(); }
bool hasPersonality() const { return !PersonalityLocs.empty(); }
void recordFnStart(SMLoc L) { FnStartLoc = L; }
void recordCantUnwind(SMLoc L) { CantUnwindLoc = L; }
void recordPersonality(SMLoc L) { PersonalityLoc = L; }
void recordHandlerData(SMLoc L) { HandlerDataLoc = L; }
void recordFnStart(SMLoc L) { FnStartLocs.push_back(L); }
void recordCantUnwind(SMLoc L) { CantUnwindLocs.push_back(L); }
void recordPersonality(SMLoc L) { PersonalityLocs.push_back(L); }
void recordHandlerData(SMLoc L) { HandlerDataLocs.push_back(L); }
void saveFPReg(int Reg) { FPReg = Reg; }
int getFPReg() const { return FPReg; }
void emitFnStartLocNotes() const {
Parser.Note(FnStartLoc, ".fnstart was specified here");
for (Locs::const_iterator FI = FnStartLocs.begin(), FE = FnStartLocs.end();
FI != FE; ++FI)
Parser.Note(*FI, ".fnstart was specified here");
}
void emitCantUnwindLocNotes() const {
Parser.Note(CantUnwindLoc, ".cantunwind was specified here");
for (Locs::const_iterator UI = CantUnwindLocs.begin(),
UE = CantUnwindLocs.end(); UI != UE; ++UI)
Parser.Note(*UI, ".cantunwind was specified here");
}
void emitHandlerDataLocNotes() const {
Parser.Note(HandlerDataLoc, ".handlerdata was specified here");
for (Locs::const_iterator HI = HandlerDataLocs.begin(),
HE = HandlerDataLocs.end(); HI != HE; ++HI)
Parser.Note(*HI, ".handlerdata was specified here");
}
void emitPersonalityLocNotes() const {
Parser.Note(PersonalityLoc, ".personality was specified here");
for (Locs::const_iterator PI = PersonalityLocs.begin(),
PE = PersonalityLocs.end(); PI != PE; ++PI)
Parser.Note(*PI, ".personality was specified here");
}
void reset() {
FnStartLoc = SMLoc();
CantUnwindLoc = SMLoc();
PersonalityLoc = SMLoc();
HandlerDataLoc = SMLoc();
FnStartLocs = Locs();
CantUnwindLocs = Locs();
PersonalityLocs = Locs();
HandlerDataLocs = Locs();
FPReg = -1;
}
};

30
llvm/test/MC/ARM/unwind-stack-diagnostics.s Normal file
View File

@ -0,0 +1,30 @@
@ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s
.syntax unified
.thumb
.text
.global multiple_personality_disorder
.type multiple_personality_disorder,%function
multiple_personality_disorder:
.fnstart
.personality __gcc_personality_v0
.personality __gxx_personality_v0
.personality __gxx_personality_sj0
.cantunwind
@ CHECK: error: .cantunwind can't be used with .personality directive
@ CHECK: .cantunwind
@ CHECK: ^
@ CHECK: note: .personality was specified here
@ CHECK: .personality __gcc_personality_v0
@ CHECK: ^
@ CHECK: note: .personality was specified here
@ CHECK: .personality __gxx_personality_v0
@ CHECK: ^
@ CHECK: note: .personality was specified here
@ CHECK: .personality __gxx_personality_sj0
@ CHECK: ^