diff options
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 21 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript-diagnostic.s | 22 |
2 files changed, 43 insertions, 0 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index abd8d0a8344..36c92524166 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -138,6 +138,7 @@ private: void readSectionPatterns(StringRef OutSec, bool Keep); size_t getPos(); + void printErrorPos(); std::vector<uint8_t> parseHex(StringRef S); StringSaver Saver; @@ -172,11 +173,31 @@ void ScriptParser::run() { } } +// Returns the line that the character S[Pos] is in. +static StringRef getLine(StringRef S, size_t Pos) { + size_t Begin = S.rfind('\n', Pos); + size_t End = S.find('\n', Pos); + Begin = (Begin == StringRef::npos) ? 0 : Begin + 1; + if (End == StringRef::npos) + End = S.size(); + // rtrim for DOS-style newlines. + return S.substr(Begin, End - Begin).rtrim(); +} + +void ScriptParser::printErrorPos() { + StringRef Tok = Tokens[Pos == 0 ? 0 : Pos - 1]; + StringRef Line = getLine(Input, Tok.data() - Input.data()); + size_t Col = Tok.data() - Line.data(); + error(Line); + error(std::string(Col, ' ') + "^"); +} + // We don't want to record cascading errors. Keep only the first one. void ScriptParser::setError(const Twine &Msg) { if (Error) return; error("line " + Twine(getPos()) + ": " + Msg); + printErrorPos(); Error = true; } diff --git a/lld/test/ELF/linkerscript-diagnostic.s b/lld/test/ELF/linkerscript-diagnostic.s index 725e64b0d49..f42cbe82cf3 100644 --- a/lld/test/ELF/linkerscript-diagnostic.s +++ b/lld/test/ELF/linkerscript-diagnostic.s @@ -42,3 +42,25 @@ # RUN: echo ".temp + { *(.temp) } }" >> %t.script # RUN: not ld.lld -shared %t -o %t1 --script %t.script 2>&1 | FileCheck -check-prefix=ERR5 %s # ERR5: line 6: + +## Check that text of lines and pointer to 'bad' token are working ok. +# RUN: echo "UNKNOWN_TAG {" > %t.script +# RUN: echo ".text : { *(.text) }" >> %t.script +# RUN: echo ".keep : { *(.keep) }" >> %t.script +# RUN: echo ".temp : { *(.temp) } }" >> %t.script +# RUN: not ld.lld -shared %t -o %t1 --script %t.script > %t.log 2>&1 +# RUN: FileCheck -check-prefix=ERR6 %s < %t.log +# ERR6: line 1: +# ERR6-NEXT: UNKNOWN_TAG { +# RUN: grep '^^' %t.log + +## One more check that text of lines and pointer to 'bad' token are working ok. +# RUN: echo "SECTIONS {" > %t.script +# RUN: echo ".text : { *(.text) }" >> %t.script +# RUN: echo ".keep : { *(.keep) }" >> %t.script +# RUN: echo "boom .temp : { *(.temp) } }" >> %t.script +# RUN: not ld.lld -shared %t -o %t1 --script %t.script > %t.log 2>&1 +# RUN: FileCheck -check-prefix=ERR7 %s < %t.log +# ERR7: line 4: : expected, but got .temp +# ERR7-NEXT: boom .temp : { *(.temp) } } +# RUN: grep '^ ^' %t.log |
