From: Sergey Dmitrouk <sdmitrouk@accesssoftek.com>
Date: Thu, 7 May 2015 18:33:50 +0000 (+0000)
Subject: Disable r235989 "Reapply r235977 "[DebugInfo] Add debug locations to constant SD... 
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5ef2a17a629bd04d768a28a509d6d4ebfb1efbb3;p=oota-llvm.git

Disable r235989 "Reapply r235977 "[DebugInfo] Add debug locations to constant SD nodes""

Will be re-enabled with missing changes for ConstantFPSDNode and
fixes for wrong locations due to constant coalescing.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236758 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/CodeGen/SelectionDAGNodes.h b/include/llvm/CodeGen/SelectionDAGNodes.h
index 6419fd3c4ec..6a3b52bdecd 100644
--- a/include/llvm/CodeGen/SelectionDAGNodes.h
+++ b/include/llvm/CodeGen/SelectionDAGNodes.h
@@ -1401,10 +1401,11 @@ public:
 class ConstantSDNode : public SDNode {
   const ConstantInt *Value;
   friend class SelectionDAG;
+  // XXX: DebugLoc is unused intentionally until constant coalescing is resolved
   ConstantSDNode(bool isTarget, bool isOpaque, const ConstantInt *val,
-                 DebugLoc DL, EVT VT)
+                 DebugLoc, EVT VT)
     : SDNode(isTarget ? ISD::TargetConstant : ISD::Constant,
-             0, DL, getSDVTList(VT)), Value(val) {
+             0, DebugLoc(), getSDVTList(VT)), Value(val) {
     SubclassData |= (uint16_t)isOpaque;
   }
 public:
diff --git a/test/DebugInfo/AArch64/constant-dbgloc.ll b/test/DebugInfo/AArch64/constant-dbgloc.ll
index a71b869f536..56e2868c637 100644
--- a/test/DebugInfo/AArch64/constant-dbgloc.ll
+++ b/test/DebugInfo/AArch64/constant-dbgloc.ll
@@ -1,4 +1,6 @@
 ; RUN: llc -filetype=asm %s -o - | FileCheck %s
+; XFAIL: *
+; disabled until constant coalescing is resolved
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 target triple = "aarch64--linux-gnueabihf"
diff --git a/test/DebugInfo/ARM/constant-dbgloc.ll b/test/DebugInfo/ARM/constant-dbgloc.ll
index c4a5703f3e8..590b67ec8d0 100644
--- a/test/DebugInfo/ARM/constant-dbgloc.ll
+++ b/test/DebugInfo/ARM/constant-dbgloc.ll
@@ -1,4 +1,6 @@
 ; RUN: llc -filetype=asm %s -o - | FileCheck %s
+; XFAIL: *
+; disabled until constant coalescing is resolved
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 target triple = "armv7--linux-gnueabihf"
diff --git a/test/DebugInfo/constant-sdnodes-have-dbg-location.ll b/test/DebugInfo/constant-sdnodes-have-dbg-location.ll
index 1f502a2a262..6bfd51b4c18 100644
--- a/test/DebugInfo/constant-sdnodes-have-dbg-location.ll
+++ b/test/DebugInfo/constant-sdnodes-have-dbg-location.ll
@@ -1,5 +1,7 @@
 ; RUN: llc -debug < %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
+; XFAIL: *
+; disabled until constant coalescing is resolved
 
 ; CHECK: 0x{{[0-9,a-f]+}}: i32 = Constant<-1>test.c:4:5