This is an archive of the discontinued LLVM Phabricator instance.

[Symbolize] Handle error after the notes loop
ClosedPublic

Authored by phosek on Jan 26 2020, 4:14 PM.

Reviewers

Summary

We always have to check the error, even if we're going to ignore it.

This revision is now accepted and ready to land.Jan 26 2020, 5:35 PM

Path

Size

llvm/

lib/

DebugInfo/

Symbolize/

1 line

test/

DebugInfo/

23 lines

Show First 20 Lines • Show All 294 Lines • ▼ Show 20 Lines	Optional<ArrayRef<uint8_t>> getBuildID(const ELFFile<ELFT> *Obj) {
}		}
for (const auto &P : *PhdrsOrErr) {		for (const auto &P : *PhdrsOrErr) {
if (P.p_type != ELF::PT_NOTE)		if (P.p_type != ELF::PT_NOTE)
continue;		continue;
Error Err = Error::success();		Error Err = Error::success();
for (auto N : Obj->notes(P, Err))		for (auto N : Obj->notes(P, Err))
if (N.getType() == ELF::NT_GNU_BUILD_ID && N.getName() == ELF::ELF_NOTE_GNU)		if (N.getType() == ELF::NT_GNU_BUILD_ID && N.getName() == ELF::ELF_NOTE_GNU)
return N.getDesc();		return N.getDesc();
		consumeError(std::move(Err));
}		}
return {};		return {};
}		}

Optional<ArrayRef<uint8_t>> getBuildID(const ELFObjectFileBase *Obj) {		Optional<ArrayRef<uint8_t>> getBuildID(const ELFObjectFileBase *Obj) {
Optional<ArrayRef<uint8_t>> BuildID;		Optional<ArrayRef<uint8_t>> BuildID;
if (auto *O = dyn_cast<ELFObjectFile<ELF32LE>>(Obj))		if (auto *O = dyn_cast<ELFObjectFile<ELF32LE>>(Obj))
BuildID = getBuildID(O->getELFFile());		BuildID = getBuildID(O->getELFFile());
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines

				# RUN: yaml2obj %s -o %t

				# RUN: llvm-symbolizer --debug-file-directory=%p/Inputs --obj=%t 0x20112f \| FileCheck %s

				# CHECK: ??
				# CHECK-NEXT: ??:0:0

				--- !ELF
				FileHeader:
				Class: ELFCLASS64
				Data: ELFDATA2LSB
				Type: ET_EXEC
				Machine: EM_X86_64
				Sections:
				- Name: .note.invalid
				Type: SHT_NOTE
				Flags: [ SHF_ALLOC ]
				Content: 0123456789
				ProgramHeaders:
				- Type: PT_NOTE
				Flags: [ PF_R ]
				Sections:
				- Section: .note.invalid