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

[Sergey Dmitrouk]

Author: sdmitrouk
Date: Thu May  7 13:33:50 2015
New Revision: 236758

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

Modified:
    llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h
    llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll
    llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll
    llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll

Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=236758&r1=236757&r2=236758&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Thu May  7 13:33:50 2015
@@ -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:

Modified: llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll?rev=236758&r1=236757&r2=236758&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll (original)
+++ llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll Thu May  7 13:33:50 2015
@@ -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"

Modified: llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll?rev=236758&r1=236757&r2=236758&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll (original)
+++ llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll Thu May  7 13:33:50 2015
@@ -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"

Modified: llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll?rev=236758&r1=236757&r2=236758&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll (original)
+++ llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll Thu May  7 13:33:50 2015
@@ -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