summaryrefslogtreecommitdiffstats
path: root/llvm/lib/MC/MCParser/AsmParser.cpp
diff options
context:
space:
mode:
authorAlexander Kornienko <alexfh@google.com>2018-03-07 16:27:44 +0000
committerAlexander Kornienko <alexfh@google.com>2018-03-07 16:27:44 +0000
commite12a48bcc089b9942fa405076ccabac73fae3e86 (patch)
tree408184d9629b7fe319044f63b79fb882ce813941 /llvm/lib/MC/MCParser/AsmParser.cpp
parente245ec0cf0e157730e58f874c7366a3dbdcc9bad (diff)
downloadbcm5719-llvm-e12a48bcc089b9942fa405076ccabac73fae3e86.tar.gz
bcm5719-llvm-e12a48bcc089b9942fa405076ccabac73fae3e86.zip
Revert "Reapply "[DWARFv5] Emit file 0 to the line table.""
This reverts commit r326839. r326839 breaks assembly file parsing: $ cat q.c void g() {} $ clang -S q.c -g $ clang -g -c q.s q.s:9:2: error: file number already allocated .file 1 "/tmp/test" "q.c" ^ llvm-svn: 326902
Diffstat (limited to 'llvm/lib/MC/MCParser/AsmParser.cpp')
-rw-r--r--llvm/lib/MC/MCParser/AsmParser.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index 2df5251097c..54a76732bbe 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -3258,8 +3258,8 @@ bool AsmParser::parseDirectiveFile(SMLoc DirectiveLoc) {
FileNumber = getTok().getIntVal();
Lex();
- if (FileNumber < 0)
- return TokError("negative file number");
+ if (FileNumber < 1)
+ return TokError("file number less than one");
}
std::string Path = getTok().getString();
@@ -3338,8 +3338,6 @@ bool AsmParser::parseDirectiveFile(SMLoc DirectiveLoc) {
// we turn off -g option, directly use the existing debug info instead.
if (getContext().getGenDwarfForAssembly())
getContext().setGenDwarfForAssembly(false);
- else if (FileNumber == 0)
- getStreamer().emitDwarfFile0Directive(Directory, Filename, CKMem, Source);
else {
Expected<unsigned> FileNumOrErr = getStreamer().tryEmitDwarfFileDirective(
FileNumber, Directory, Filename, CKMem, Source);
OpenPOWER on IntegriCloud