[PATCH] D66825: [10/10] [LLD] [COFF] Silently drop a manifest with language 0, if there's another manifest with a nonzero language id

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 217718.
mstorsjo added a comment.

Moved the manifest duplicate cleanup to a separate method which is called after parsing and adding nodes to the tree, allowing sharing most of the code for both input file types. I still kept one check for ignoring duplicates of manifests with language zero in the parse phase though (and added a testcase for it) even though I'm unsure if that's a real issue that would arise.

By restructuring the code, it's much easier to limit most of this manifest handling to mingw mode.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D66825/new/

https://reviews.llvm.org/D66825

Files:
  lld/COFF/DriverUtils.cpp
  lld/test/COFF/Inputs/manifest-lang0.o
  lld/test/COFF/Inputs/manifest-lang0.res
  lld/test/COFF/Inputs/manifest-lang1.o
  lld/test/COFF/Inputs/manifest-lang1.res
  lld/test/COFF/Inputs/manifest-lang2.o
  lld/test/COFF/Inputs/manifest-lang2.res
  lld/test/COFF/merge-resource-manifest.test
  llvm/include/llvm/Object/WindowsResource.h
  llvm/lib/Object/WindowsResource.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66825.217718.patch
Type: text/x-patch
Size: 9027 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190828/ba4352d6/attachment.bin>