[llvm-branch-commits] [llvm-branch] r305187 - Merging r304537:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Jun 12 09:17:05 2017
New Revision: 305187

URL: http://llvm.org/viewvc/llvm-project?rev=305187&view=rev
Log:
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

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

Modified:
    llvm/branches/release_40/lib/CodeGen/GlobalMerge.cpp
    llvm/branches/release_40/test/CodeGen/ARM/global-merge-external.ll

Modified: llvm/branches/release_40/lib/CodeGen/GlobalMerge.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/lib/CodeGen/GlobalMerge.cpp?rev=305187&r1=305186&r2=305187&view=diff
==============================================================================
--- llvm/branches/release_40/lib/CodeGen/GlobalMerge.cpp (original)
+++ llvm/branches/release_40/lib/CodeGen/GlobalMerge.cpp Mon Jun 12 09:17:05 2017
@@ -559,6 +559,10 @@ bool GlobalMerge::doInitialization(Modul
     if (GV.isDeclaration() || GV.isThreadLocal() || GV.hasSection())
       continue;
 
+    // It's not safe to merge globals that may be preempted
+    if (TM && !TM->shouldAssumeDSOLocal(M, &GV))
+      continue;
+
     if (!(MergeExternalGlobals && GV.hasExternalLinkage()) &&
         !GV.hasInternalLinkage())
       continue;

Modified: llvm/branches/release_40/test/CodeGen/ARM/global-merge-external.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/CodeGen/ARM/global-merge-external.ll?rev=305187&r1=305186&r2=305187&view=diff
==============================================================================
--- llvm/branches/release_40/test/CodeGen/ARM/global-merge-external.ll (original)
+++ llvm/branches/release_40/test/CodeGen/ARM/global-merge-external.ll Mon Jun 12 09:17:05 2017
@@ -2,6 +2,7 @@
 ; RUN: llc < %s -mtriple=arm-eabi  -arm-global-merge -global-merge-on-external=true  | FileCheck %s --check-prefix=CHECK-MERGE
 ; RUN: llc < %s -mtriple=arm-eabi  -arm-global-merge -global-merge-on-external=false | FileCheck %s --check-prefix=CHECK-NO-MERGE
 ; RUN: llc < %s -mtriple=arm-macho -arm-global-merge                                 | FileCheck %s --check-prefix=CHECK-NO-MERGE
+; RUN: llc < %s -mtriple=arm-eabi  -arm-global-merge -relocation-model=pic           | FileCheck %s --check-prefix=CHECK-NO-MERGE
 
 @x = global i32 0, align 4
 @y = global i32 0, align 4