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

[ms-inline asm] Fix a memory leak introduced in r161686. 

llvm-svn: 161698
This commit is contained in:
Chad Rosier 2012-08-10 21:06:19 +00:00
parent 4c923b3b3f
commit d6ef704fe4
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/AST/Stmt.h
View File

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

13
clang/lib/AST/Stmt.cpp
View File

@ -586,7 +586,7 @@ 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,
ArrayRef<std::string> clobbers, SourceLocation endloc)
ArrayRef<StringRef> clobbers, SourceLocation endloc)
: Stmt(MSAsmStmtClass), AsmLoc(asmloc), EndLoc(endloc),
AsmStr(asmstr.str()), IsSimple(issimple), IsVolatile(isvolatile),
NumAsmToks(asmtoks.size()), NumLineEnds(lineends.size()),
@ -600,9 +600,14 @@ MSAsmStmt::MSAsmStmt(ASTContext &C, SourceLocation asmloc,
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];
Clobbers = new (C) StringRef*[NumClobbers];
for (unsigned i = 0, e = NumClobbers; i != e; ++i) {
// FIXME: Avoid the allocation/copy if at all possible.
size_t size = clobbers[i].size();
char *dest = new (C) char[size];
std::strncpy(dest, clobbers[i].data(), size);
Clobbers[i] = new (C) StringRef(dest, size);
}
}
ObjCForCollectionStmt::ObjCForCollectionStmt(Stmt *Elem, Expr *Collect,

2
clang/lib/Sema/SemaStmt.cpp
View File

@ -2883,7 +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;
SmallVector<StringRef,4> Clobbers;
// Empty asm statements don't need to instantiate the AsmParser, etc.
if (AsmToks.empty()) {