[llvm-branch-commits] [llvm-branch] r287906 - Merging r287353:

[Hans Wennborg via llvm-branch-commits]

On Thu, Nov 24, 2016 at 5:47 PM, Tom Stellard via llvm-branch-commits
<llvm-branch-commits at lists.llvm.org> wrote:
> Author: tstellar
> Date: Thu Nov 24 19:47:20 2016
> New Revision: 287906
>
> URL: http://llvm.org/viewvc/llvm-project?rev=287906&view=rev
> Log:
> Merging r287353:
>
> ------------------------------------------------------------------------
> r287353 | hans | 2016-11-18 09:33:05 -0800 (Fri, 18 Nov 2016) | 12 lines
>
> IRMover: Avoid accidentally mapping types from the destination module (PR30799)
>
> During Module linking, it's possible for SrcM->getIdentifiedStructTypes();
> to return types that are actually defined in the destination module
> (DstM). Depending on how the bitcode file was read,
> getIdentifiedStructTypes() might do a walk over all values, including
> metadata nodes, looking for types. In my case, a debug info metadata
> node was shared between the two modules, and it referred to a type
> defined in the destination module (see test case).
>
> Differential Revision: https://reviews.llvm.org/D26212
>
> ------------------------------------------------------------------------

This breaks the tests on Windows. r287360 is also needed.

I didn't notice this before trying to build 3.9.1-rc1 since I wasn't
cc'd anywhere related to this merge.