diff options
| author | dim <dim@FreeBSD.org> | 2014-11-08 13:19:48 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-08 13:19:48 +0000 |
| commit | cfcb039e4e385eb6d4f9064f1bf5f55b5a888121 (patch) | |
| tree | bc6b425739279387d3ef6eb312296d07c47a33c5 /contrib/llvm/lib/MC | |
| parent | ac5c592f50cbae9d0b7747972189a4e5cc17d736 (diff) | |
| download | FreeBSD-src-cfcb039e4e385eb6d4f9064f1bf5f55b5a888121.zip FreeBSD-src-cfcb039e4e385eb6d4f9064f1bf5f55b5a888121.tar.gz | |
Pull in r201784 from upstream llvm trunk (by Benjamin Kramer):
AsmParser: Disable Darwin-style macro argument expansion on non-darwin targets.
There is code in the wild that relies on $0 not being expanded.
This fixes some cases of using $ signs in literals being incorrectly
assembled.
Reported by: Richard Henderson
Upstream PR: http://llvm.org/PR21500
MFC after: 3 days
Diffstat (limited to 'contrib/llvm/lib/MC')
| -rw-r--r-- | contrib/llvm/lib/MC/MCParser/AsmParser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/llvm/lib/MC/MCParser/AsmParser.cpp b/contrib/llvm/lib/MC/MCParser/AsmParser.cpp index 5eeb308..7f8e9df 100644 --- a/contrib/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/contrib/llvm/lib/MC/MCParser/AsmParser.cpp @@ -1695,7 +1695,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body, const MCAsmMacroParameters &Parameters, const MCAsmMacroArguments &A, const SMLoc &L) { unsigned NParameters = Parameters.size(); - if (NParameters != 0 && NParameters != A.size()) + if ((!IsDarwin || NParameters != 0) && NParameters != A.size()) return Error(L, "Wrong number of arguments"); // A macro without parameters is handled differently on Darwin: @@ -1705,7 +1705,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body, std::size_t End = Body.size(), Pos = 0; for (; Pos != End; ++Pos) { // Check for a substitution or escape. - if (!NParameters) { + if (IsDarwin && !NParameters) { // This macro has no parameters, look for $0, $1, etc. if (Body[Pos] != '$' || Pos + 1 == End) continue; @@ -1728,7 +1728,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body, if (Pos == End) break; - if (!NParameters) { + if (IsDarwin && !NParameters) { switch (Body[Pos + 1]) { // $$ => $ case '$': |
