This is an archive of the discontinued LLVM Phabricator instance.

Differential D84300

[LLD][ELF] - Linkerscript: report location for the "unclosed comment in a linker script" error.
ClosedPublic

Authored by grimar on Jul 22 2020, 2:53 AM.

Details

Reviewers
MaskRay
psmith
• espindola
Commits
rGae4279bd3e8d: [LLD][ELF] - Linkerscript: report location for the "unclosed comment in a…
Summary

Currently we print "error: unclosed comment in a linker script", which doesn't
provide information about the real error location.

Fixes https://bugs.llvm.org/show_bug.cgi?id=46793.

Diff Detail

Event Timeline

grimar created this revision.Jul 22 2020, 2:53 AM
Herald added a reviewer: • espindola. · View Herald TranscriptJul 22 2020, 2:53 AM
Herald added subscribers: arichardson, emaste. · View Herald Transcript
MaskRay accepted this revision.Jul 23 2020, 8:31 AM

Thanks!

This revision is now accepted and ready to land.Jul 23 2020, 8:31 AM
MaskRay added a comment.Jul 23 2020, 8:32 AM
- provide an information about real error location.
+ provide information about the real error location.
grimar edited the summary of this revision. (Show Details)Jul 24 2020, 1:31 AM
Closed by commit rGae4279bd3e8d: [LLD][ELF] - Linkerscript: report location for the "unclosed comment in a… (authored by grimar). · Explain WhyJul 24 2020, 1:39 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJul 24 2020, 1:39 AM

Revision Contents

PathSize
lld/
ELF/
2 lines
2 lines
test/
ELF/
linkerscript/
2 lines

Diff 280361

lld/ELF/ScriptLexer.h

Show All 18 Lines
namespace elf { namespace elf {
class ScriptLexer { class ScriptLexer {
public: public:
explicit ScriptLexer(MemoryBufferRef mb); explicit ScriptLexer(MemoryBufferRef mb);
void setError(const Twine &msg); void setError(const Twine &msg);
void tokenize(MemoryBufferRef mb); void tokenize(MemoryBufferRef mb);
static StringRef skipSpace(StringRef s); StringRef skipSpace(StringRef s);
bool atEOF(); bool atEOF();
StringRef next(); StringRef next();
StringRef peek(); StringRef peek();
StringRef peek2(); StringRef peek2();
void skip(); void skip();
bool consume(StringRef tok); bool consume(StringRef tok);
void expect(StringRef expect); void expect(StringRef expect);
bool consumeLabel(StringRef tok); bool consumeLabel(StringRef tok);
Show All 21 Lines

lld/ELF/ScriptLexer.cpp

Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Lines
} }
// Skip leading whitespace characters or comments. // Skip leading whitespace characters or comments.
StringRef ScriptLexer::skipSpace(StringRef s) { StringRef ScriptLexer::skipSpace(StringRef s) {
for (;;) { for (;;) {
if (s.startswith("/*")) { if (s.startswith("/*")) {
size_t e = s.find("*/", 2); size_t e = s.find("*/", 2);
if (e == StringRef::npos) { if (e == StringRef::npos) {
error("unclosed comment in a linker script"); setError("unclosed comment in a linker script");
return ""; return "";
} }
s = s.substr(e + 2); s = s.substr(e + 2);
continue; continue;
} }
if (s.startswith("#")) { if (s.startswith("#")) {
size_t e = s.find('\n', 1); size_t e = s.find('\n', 1);
if (e == StringRef::npos) if (e == StringRef::npos)
▲ Show 20 Lines • Show All 147 Lines • Show Last 20 Lines

lld/test/ELF/linkerscript/diag6.test

# REQUIRES: x86 # REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.o
# RUN: not ld.lld -shared %t.o -o /dev/null --script %s 2>&1 | FileCheck %s # RUN: not ld.lld -shared %t.o -o /dev/null --script %s 2>&1 | FileCheck %s
SECTIONS /* SECTIONS /*
CHECK: error: unclosed comment in a linker script CHECK: error: {{.*}}diag6.test:1: unclosed comment in a linker script