diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-08-10 21:06:19 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-08-10 21:06:19 +0000 |
| commit | e790bc32ca3eb7cc396b45071d7987776e965ed7 (patch) | |
| tree | 170e01ed60a1f3174f53a8a7e59a2227459d6a78 /lib/AST/Stmt.cpp | |
| parent | bb5185c0ca3de4e7d91d011a83c902d7b02a2a1a (diff) | |
[ms-inline asm] Fix a memory leak introduced in r161686.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161698 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/Stmt.cpp')
| -rw-r--r-- | lib/AST/Stmt.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp index 9bf9980004..c9cca556f4 100644 --- a/lib/AST/Stmt.cpp +++ b/lib/AST/Stmt.cpp @@ -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, |