tree d01bcc302592a446451c4348293c432dca7edc92
parent f3d3277bb713bb8aced9a7ac2e9b05c52d2844ee
author Tom Stellard <tstellar@redhat.com> 1497277025 +0000
committer Tom Stellard <tstellar@redhat.com> 1497277025 +0000

Merging r304537:

------------------------------------------------------------------------
r304537 | john.brawn | 2017-06-02 06:24:14 -0400 (Fri, 02 Jun 2017) | 9 lines

[GlobalMerge] Don't merge globals that may be preempted

When a global may be preempted it needs to be accessed directly, instead of
indirectly through a MergedGlobals symbol, for the preemption to work.

This fixes PR33136.

Differential Revision: https://reviews.llvm.org/D33727

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_40@305187 91177308-0d34-0410-b5e6-96231b3b80d8