[ms-inline asm] Add clobbers to AST representation.

llvm-svn: 161686
This commit is contained in:
Chad Rosier 2012-08-10 19:13:14 +00:00
parent 8d48c8c675
commit a7020aee00
3 changed files with 16 additions and 5 deletions

View File

@ -1628,16 +1628,18 @@ class MSAsmStmt : public Stmt {
unsigned NumAsmToks;
unsigned NumLineEnds;
unsigned NumClobbers;
Token *AsmToks;
unsigned *LineEnds;
Stmt **Exprs;
std::string *Clobbers;
public:
MSAsmStmt(ASTContext &C, SourceLocation asmloc, bool issimple,
bool isvolatile, ArrayRef<Token> asmtoks,
ArrayRef<unsigned> lineends, StringRef asmstr,
SourceLocation endloc);
ArrayRef<std::string> clobbers, SourceLocation endloc);
SourceLocation getAsmLoc() const { return AsmLoc; }
void setAsmLoc(SourceLocation L) { AsmLoc = L; }
@ -1662,6 +1664,9 @@ public:
//===--- Other ---===//
unsigned getNumClobbers() const { return NumClobbers; }
StringRef getClobber(unsigned i) { return Clobbers[i]; }
SourceRange getSourceRange() const LLVM_READONLY {
return SourceRange(AsmLoc, EndLoc);
}

View File

@ -586,10 +586,11 @@ AsmStmt::AsmStmt(ASTContext &C, SourceLocation asmloc, bool issimple,
MSAsmStmt::MSAsmStmt(ASTContext &C, SourceLocation asmloc,
bool issimple, bool isvolatile, ArrayRef<Token> asmtoks,
ArrayRef<unsigned> lineends, StringRef asmstr,
SourceLocation endloc)
ArrayRef<std::string> clobbers, SourceLocation endloc)
: Stmt(MSAsmStmtClass), AsmLoc(asmloc), EndLoc(endloc),
AsmStr(asmstr.str()), IsSimple(issimple), IsVolatile(isvolatile),
NumAsmToks(asmtoks.size()), NumLineEnds(lineends.size()) {
NumAsmToks(asmtoks.size()), NumLineEnds(lineends.size()),
NumClobbers(clobbers.size()) {
AsmToks = new (C) Token[NumAsmToks];
for (unsigned i = 0, e = NumAsmToks; i != e; ++i)
@ -598,6 +599,10 @@ MSAsmStmt::MSAsmStmt(ASTContext &C, SourceLocation asmloc,
LineEnds = new (C) unsigned[NumLineEnds];
for (unsigned i = 0, e = NumLineEnds; i != e; ++i)
LineEnds[i] = lineends[i];
Clobbers = new (C) std::string[NumClobbers];
for (unsigned i = 0, e = NumClobbers; i != e; ++i)
Clobbers[i] = clobbers[i];
}
ObjCForCollectionStmt::ObjCForCollectionStmt(Stmt *Elem, Expr *Collect,

View File

@ -2883,6 +2883,7 @@ StmtResult Sema::ActOnMSAsmStmt(SourceLocation AsmLoc,
SourceLocation EndLoc) {
// MS-style inline assembly is not fully supported, so emit a warning.
Diag(AsmLoc, diag::warn_unsupported_msasm);
SmallVector<std::string,4> Clobbers;
// Empty asm statements don't need to instantiate the AsmParser, etc.
if (AsmToks.empty()) {
@ -2890,7 +2891,7 @@ StmtResult Sema::ActOnMSAsmStmt(SourceLocation AsmLoc,
MSAsmStmt *NS =
new (Context) MSAsmStmt(Context, AsmLoc, /* IsSimple */ true,
/* IsVolatile */ true, AsmToks, LineEnds,
AsmString, EndLoc);
AsmString, Clobbers, EndLoc);
return Owned(NS);
}
@ -2937,7 +2938,7 @@ StmtResult Sema::ActOnMSAsmStmt(SourceLocation AsmLoc,
MSAsmStmt *NS =
new (Context) MSAsmStmt(Context, AsmLoc, IsSimple, /* IsVolatile */ true,
AsmToks, LineEnds, AsmString, EndLoc);
AsmToks, LineEnds, AsmString, Clobbers, EndLoc);
return Owned(NS);
}