This is an archive of the discontinued LLVM Phabricator instance.

[07/10] [WindowsResource] Avoid duplicating the input filenames for each resource. NFC.
ClosedPublic

Authored by mstorsjo on Aug 27 2019, 12:09 PM.

Reviewers

Commits

This revision is now accepted and ready to land.Aug 29 2019, 1:32 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

llvm/

lib/

Object/

9 lines

Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines	if (E.isA<EmptyResError>()) {
// WindowsResource::createWindowsResource().		// WindowsResource::createWindowsResource().
consumeError(std::move(E));		consumeError(std::move(E));
return Error::success();		return Error::success();
}		}
return E;		return E;
}		}

ResourceEntryRef Entry = EntryOrErr.get();		ResourceEntryRef Entry = EntryOrErr.get();
		uint32_t Origin = InputFilenames.size();
		InputFilenames.push_back(WR->getFileName());
bool End = false;		bool End = false;
while (!End) {		while (!End) {
Data.push_back(Entry.getData());		Data.push_back(Entry.getData());

bool IsNewTypeString = false;		bool IsNewTypeString = false;
bool IsNewNameString = false;		bool IsNewNameString = false;

TreeNode* Node;		TreeNode *Node;
bool IsNewNode = Root.addEntry(Entry, InputFilenames.size(),		bool IsNewNode =
IsNewTypeString, IsNewNameString, Node);		Root.addEntry(Entry, Origin, IsNewTypeString, IsNewNameString, Node);
InputFilenames.push_back(WR->getFileName());
if (!IsNewNode) {		if (!IsNewNode) {
Duplicates.push_back(makeDuplicateResourceError(		Duplicates.push_back(makeDuplicateResourceError(
Entry, InputFilenames[Node->Origin], WR->getFileName()));		Entry, InputFilenames[Node->Origin], WR->getFileName()));
}		}

if (IsNewTypeString)		if (IsNewTypeString)
StringTable.push_back(Entry.getTypeString());		StringTable.push_back(Entry.getTypeString());

▲ Show 20 Lines • Show All 571 Lines • Show Last 20 Lines