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

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 6419fd3c4ec9a04431534d76d8eebfd1a46dc343..6a3b52bdecd5a9547fde3e5274583f105ec4bd6a 100644 (file)
--- 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 a71b869f5366669f651069d44d15cbeca4c7e797..56e2868c637ae863266b979bd4c453b411a1872f 100644 (file)
--- 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 c4a5703f3e8b20496a0f01ecf406a6d2c5707564..590b67ec8d07e02ce96b5b7d5e0ad060aa9871b7 100644 (file)
--- 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 1f502a2a262a087b5b97f534174e19d816556e26..6bfd51b4c18d85ce6d7571b1c1949653810dc7da 100644 (file)
--- 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