This is an archive of the discontinued LLVM Phabricator instance.

Do not read the same .lib file more than once.
ClosedPublic

Authored by ruiu on Dec 11 2017, 2:22 PM.

Reviewers

Commits

Summary

In the following command line,

lld-link foo/bar.lib /defaultlib:bar.lib

"/defaultlib:bar.lib" should be a nop even if a file with the same
name exists in other library search path.

This revision is now accepted and ready to land.Dec 11 2017, 3:04 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

COFF/

2 lines

test/

COFF/

8 lines

	Show First 20 Lines • Show All 309 Lines • ▼ Show 20 Lines

	// Resolves a file path. This never returns the same path			// Resolves a file path. This never returns the same path
	// (in that case, it returns None).			// (in that case, it returns None).
	Optional<StringRef> LinkerDriver::findFile(StringRef Filename) {			Optional<StringRef> LinkerDriver::findFile(StringRef Filename) {
	StringRef Path = doFindFile(Filename);			StringRef Path = doFindFile(Filename);
	bool Seen = !VisitedFiles.insert(Path.lower()).second;			bool Seen = !VisitedFiles.insert(Path.lower()).second;
	if (Seen)			if (Seen)
	return None;			return None;
				if (Path.endswith_lower(".lib"))
				VisitedLibs.insert(sys::path::filename(Path));
	return Path;			return Path;
	}			}

	// Find library file from search path.			// Find library file from search path.
	StringRef LinkerDriver::doFindLib(StringRef Filename) {			StringRef LinkerDriver::doFindLib(StringRef Filename) {
	// Add ".lib" to Filename if that has no file extension.			// Add ".lib" to Filename if that has no file extension.
	bool HasExt = Filename.contains('.');			bool HasExt = Filename.contains('.');
	if (!HasExt)			if (!HasExt)
	▲ Show 20 Lines • Show All 987 Lines • Show Last 20 Lines

	Show All 10 Lines
	CHECK1: b{{[/\\]}}std64.lib			CHECK1: b{{[/\\]}}std64.lib

	# RUN: lld-link /out:%t.exe /entry:main /verbose \			# RUN: lld-link /out:%t.exe /entry:main /verbose \
	# RUN: std64.lib /subsystem:console %p/Inputs/hello64.obj \			# RUN: std64.lib /subsystem:console %p/Inputs/hello64.obj \
	# RUN: /libpath:%t/a /libpath:%t/b /libpath:%t/c 2> %t.log			# RUN: /libpath:%t/a /libpath:%t/b /libpath:%t/c 2> %t.log
	# RUN: FileCheck -check-prefix=CHECK2 %s < %t.log			# RUN: FileCheck -check-prefix=CHECK2 %s < %t.log

	CHECK2: a{{[/\\]}}std64.lib			CHECK2: a{{[/\\]}}std64.lib

				# RUN: lld-link /out:%t.exe /entry:main /verbose \
				# RUN: %t/a/std64.lib /subsystem:console %p/Inputs/hello64.obj \
				# RUN: /libpath:%t/b /verbose > %t.log 2>&1
				# RUN: FileCheck -check-prefix=CHECK3 %s < %t.log

				CHECK3: Reading {{.*}}a/std64.lib
				CHECK3-NOT: Reading {{.*}}b/std64.lib