[llvm-commits] [llvm] r127019 - in /llvm/trunk: lib/Target/ARM/ARMGlobalMerge.cpp test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll test/CodeGen/ARM/global-merge.ll

[Devang Patel]

Author: dpatel
Date: Fri Mar  4 13:11:05 2011
New Revision: 127019

URL: http://llvm.org/viewvc/llvm-project?rev=127019&view=rev
Log:
Disable ARMGlobalMerge on darwin. The debugger is not yet able to extract individual variable's info from merged global.

Modified:
    llvm/trunk/lib/Target/ARM/ARMGlobalMerge.cpp
    llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll
    llvm/trunk/test/CodeGen/ARM/global-merge.ll

Modified: llvm/trunk/lib/Target/ARM/ARMGlobalMerge.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMGlobalMerge.cpp?rev=127019&r1=127018&r2=127019&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMGlobalMerge.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMGlobalMerge.cpp Fri Mar  4 13:11:05 2011
@@ -53,6 +53,7 @@
 
 #define DEBUG_TYPE "arm-global-merge"
 #include "ARM.h"
+#include "ARMTargetMachine.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Attributes.h"
 #include "llvm/Constants.h"
@@ -167,6 +168,11 @@
   unsigned MaxOffset = TLI->getMaximalGlobalOffset();
   bool Changed = false;
 
+  // Disable this pass on darwin. The debugger is not yet ready to extract
+  // variable's  info from a merged global.
+  if (TLI->getTargetMachine().getSubtarget<ARMSubtarget>().isTargetDarwin())
+    return false;
+
   // Grab all non-const globals.
   for (Module::global_iterator I = M.global_begin(),
          E = M.global_end(); I != E; ++I) {

Modified: llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll?rev=127019&r1=127018&r2=127019&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll Fri Mar  4 13:11:05 2011
@@ -1,5 +1,5 @@
 ; RUN: llc < %s | FileCheck %s
-
+; XFAIL: darwin
 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32"
 target triple = "thumbv7-apple-darwin10"
 

Modified: llvm/trunk/test/CodeGen/ARM/global-merge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/global-merge.ll?rev=127019&r1=127018&r2=127019&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/global-merge.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/global-merge.ll Fri Mar  4 13:11:05 2011
@@ -1,4 +1,5 @@
 ; RUN: llc < %s -mtriple=thumb-apple-darwin | FileCheck %s
+; XFAIL: darwin
 ; Test the ARMGlobalMerge pass.  Use -march=thumb because it has a small
 ; value for the maximum offset (127).