diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/Stmt.cpp | 9 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/clang/lib/AST/Stmt.cpp b/clang/lib/AST/Stmt.cpp index f676711d7cc..9bf9980004f 100644 --- a/clang/lib/AST/Stmt.cpp +++ b/clang/lib/AST/Stmt.cpp @@ -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, diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 56ac7c5d46d..716f4df5267 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -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); } |
