This is an archive of the discontinued LLVM Phabricator instance.

Differential D130117

[LLD] [COFF] Improve the error message for too many exported symbols
ClosedPublic

Authored by mstorsjo on Jul 19 2022, 1:15 PM.

Details

Reviewers
rnk
MaskRay
Commits
rG801971e5b4c0: [LLD] [COFF] Improve the error message for too many exported symbols
Summary

Print the actual number of symbols that would have been exported
too, which helps assessing the situation.

Diff Detail

Event Timeline

mstorsjo created this revision.Jul 19 2022, 1:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2022, 1:15 PM
Herald added a subscriber: StephenFan. · View Herald Transcript
mstorsjo requested review of this revision.Jul 19 2022, 1:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2022, 1:15 PM
MaskRay accepted this revision.Jul 19 2022, 1:47 PM
This revision is now accepted and ready to land.Jul 19 2022, 1:47 PM
Harbormaster completed remote builds in B176334: Diff 445923.Jul 19 2022, 2:35 PM
rnk accepted this revision.Jul 19 2022, 3:23 PM
Closed by commit rG801971e5b4c0: [LLD] [COFF] Improve the error message for too many exported symbols (authored by mstorsjo). · Explain WhyJul 20 2022, 6:59 AM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG801971e5b4c0: [LLD] [COFF] Improve the error message for too many exported symbols.

Revision Contents

PathSize
lld/
COFF/
2 lines
test/
COFF/
2 lines

Diff 445923

lld/COFF/DriverUtils.cpp

Show First 20 Lines • Show All 703 Lines • ▼ Show 20 Linesvoid assignExportOrdinals() {
// Assign unique ordinals if default (= 0). // Assign unique ordinals if default (= 0).
uint32_t max = 0; uint32_t max = 0;
for (Export &e : config->exports) for (Export &e : config->exports)
max = std::max(max, (uint32_t)e.ordinal); max = std::max(max, (uint32_t)e.ordinal);
for (Export &e : config->exports) for (Export &e : config->exports)
if (e.ordinal == 0) if (e.ordinal == 0)
e.ordinal = ++max; e.ordinal = ++max;
if (max > std::numeric_limits<uint16_t>::max()) if (max > std::numeric_limits<uint16_t>::max())
fatal("too many exported symbols (max " + fatal("too many exported symbols (got " + Twine(max) + ", max " +
Twine(std::numeric_limits<uint16_t>::max()) + ")"); Twine(std::numeric_limits<uint16_t>::max()) + ")");
} }
// Parses a string in the form of "key=value" and check // Parses a string in the form of "key=value" and check
// if value matches previous values for the same key. // if value matches previous values for the same key.
void checkFailIfMismatch(StringRef arg, InputFile *source) { void checkFailIfMismatch(StringRef arg, InputFile *source) {
StringRef k, v; StringRef k, v;
std::tie(k, v) = arg.split('='); std::tie(k, v) = arg.split('=');
▲ Show 20 Lines • Show All 245 Lines • Show Last 20 Lines

lld/test/COFF/export-limit.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: %python %p/Inputs/def-many.py 65535 > %t-65535.def # RUN: %python %p/Inputs/def-many.py 65535 > %t-65535.def
# RUN: %python %p/Inputs/def-many.py 65536 > %t-65536.def # RUN: %python %p/Inputs/def-many.py 65536 > %t-65536.def
# RUN: llvm-mc -triple x86_64-win32 %s -filetype=obj -o %t.obj # RUN: llvm-mc -triple x86_64-win32 %s -filetype=obj -o %t.obj
# RUN: lld-link -dll -noentry %t.obj -out:%t.dll -def:%t-65535.def # RUN: lld-link -dll -noentry %t.obj -out:%t.dll -def:%t-65535.def
# RUN: env LLD_IN_TEST=1 not lld-link -dll -noentry %t.obj -out:%t.dll -def:%t-65536.def 2>&1 | FileCheck %s # RUN: env LLD_IN_TEST=1 not lld-link -dll -noentry %t.obj -out:%t.dll -def:%t-65536.def 2>&1 | FileCheck %s
# CHECK: error: too many exported symbols # CHECK: error: too many exported symbols (got 65536, max 65535)
.text .text
.globl f .globl f
f: f:
ret ret