diff options
| author | Kevin Enderby <enderby@apple.com> | 2012-11-05 21:55:41 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2012-11-05 21:55:41 +0000 |
| commit | 27121c15438055fd07f0dd2f2f4b2e3645d9bc5c (patch) | |
| tree | 0ff24468c84ff98ec5349ff8a7fa26fc3ededc0d | |
| parent | 43a172d935b69d1b9532cd78a99e285ac3e3076a (diff) | |
| download | bcm5719-llvm-27121c15438055fd07f0dd2f2f4b2e3645d9bc5c.tar.gz bcm5719-llvm-27121c15438055fd07f0dd2f2f4b2e3645d9bc5c.zip | |
Fix for PR14264 cause by commit r167237 which did not take into account a
possible buffer change with a .macro directive.
rdar://12637628
llvm-svn: 167408
| -rw-r--r-- | llvm/lib/MC/MCParser/AsmParser.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/MC/MachO/gen-dwarf-macro-cpp.s | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index ae3d660ff91..6f2e85e5533 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -154,6 +154,7 @@ private: StringRef CppHashFilename; int64_t CppHashLineNumber; SMLoc CppHashLoc; + int CppHashBuf; /// AssemblerDialect. ~OU means unset value and use value provided by MAI. unsigned AssemblerDialect; @@ -1403,7 +1404,7 @@ bool AsmParser::ParseStatement(ParseStatementInfo &Info) { getStreamer().EmitDwarfFileDirective( getContext().nextGenDwarfFileNumber(), StringRef(), CppHashFilename); - unsigned CppHashLocLineNo = SrcMgr.FindLineNumber(CppHashLoc, CurBuffer); + unsigned CppHashLocLineNo = SrcMgr.FindLineNumber(CppHashLoc,CppHashBuf); Line = CppHashLineNumber - 1 + (Line - CppHashLocLineNo); } @@ -1465,6 +1466,7 @@ bool AsmParser::ParseCppHashLineFilenameComment(const SMLoc &L) { CppHashLoc = L; CppHashFilename = Filename; CppHashLineNumber = LineNumber; + CppHashBuf = CurBuffer; // Ignore any trailing characters, they're just comment. EatToEndOfLine(); diff --git a/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s b/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s new file mode 100644 index 00000000000..05a449b4027 --- /dev/null +++ b/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s @@ -0,0 +1,17 @@ +// RUN: llvm-mc -g -triple i386-apple-darwin10 %s -filetype=obj -o %t +// RUN: llvm-dwarfdump %t | FileCheck %s + +# 1 "foo.S" 2 +.macro switcher + ljmp *0x38(%ecx) +.endmacro + switcher NaClSwitchNoSSE, 0 + +// PR14264 was a crash in the code caused by the .macro not handled correctly +// rdar://12637628 + +// We check that the source name "foo.S" is picked up +// CHECK: Dir Mod Time File Len File Name +// CHECK: ---- ---------- ---------- --------------------------- +// CHECK: file_names[ 1] 1 0x00000000 0x00000000 gen-dwarf-macro-cpp.s +// CHECK: file_names[ 2] 0 0x00000000 0x00000000 foo.S |
