This is an archive of the discontinued LLVM Phabricator instance.

[ELF] Prevent SEGFAULT in case of conflict with an internally defined symbol.
ClosedPublic

Authored by ikudrin on Nov 19 2015, 10:36 AM.

Reviewers

Commits

ikudrin retitled this revision from to [ELF] Prevent SEGFAULT in case of conflict with an internally defined symbol..

ikudrin updated this object.

ikudrin added a reviewer: ruiu.

ikudrin added a project: lld.

ikudrin added a subscriber: llvm-commits.

LGTM

This revision is now accepted and ready to land.Nov 19 2015, 10:37 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

lld/

trunk/

ELF/

3 lines

test/

ELF/

11 lines

Show First 20 Lines • Show All 133 Lines • ▼ Show 20 Lines	for (const std::unique_ptr<ObjectFile<ELFT>> &File : ObjectFiles) {
Elf_Sym_Range Syms = File->getObj().symbols(File->getSymbolTable());		Elf_Sym_Range Syms = File->getObj().symbols(File->getSymbolTable());
if (&OldE > Syms.begin() && &OldE < Syms.end())		if (&OldE > Syms.begin() && &OldE < Syms.end())
OldFile = File.get();		OldFile = File.get();
if (&NewE > Syms.begin() && &NewE < Syms.end())		if (&NewE > Syms.begin() && &NewE < Syms.end())
NewFile = File.get();		NewFile = File.get();
}		}

std::string Msg = (Message + ": " + Old.getName() + " in " +		std::string Msg = (Message + ": " + Old.getName() + " in " +
OldFile->getName() + " and " + NewFile->getName())		(OldFile ? OldFile->getName() : "(internal)") + " and " +
		(NewFile ? NewFile->getName() : "(internal)"))
.str();		.str();
if (Warning)		if (Warning)
warning(Msg);		warning(Msg);
else		else
error(Msg);		error(Msg);
}		}

// This function resolves conflicts if there's an existing symbol with		// This function resolves conflicts if there's an existing symbol with
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines

				# Should print an expected message in case of conflict with an internally generated symbol.

				# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
				# RUN: not ld.lld -shared %t.o -o %t.so 2>&1 \| FileCheck %s

				# CHECK: duplicate symbol: _gp in (internal) and {{.*}}

				# REQUIRES: mips

				.globl _gp
				_gp = 0