<div dir="ltr">This isn't generally how we deal with such things. Do you have an ETA? If it's more than a few hours then reverting is probably best (I hate to say, I know how hard it is to keep this patch going).<br><div><br></div><div>-eric</div></div><br><div class="gmail_quote">On Thu, May 7, 2015 at 11:43 AM Sergey Dmitrouk <<a href="mailto:sdmitrouk@accesssoftek.com">sdmitrouk@accesssoftek.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: sdmitrouk<br>
Date: Thu May  7 13:33:50 2015<br>
New Revision: 236758<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=236758&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=236758&view=rev</a><br>
Log:<br>
Disable r235989 "Reapply r235977 "[DebugInfo] Add debug locations to constant SD nodes""<br>
<br>
Will be re-enabled with missing changes for ConstantFPSDNode and<br>
fixes for wrong locations due to constant coalescing.<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h<br>
    llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll<br>
    llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll<br>
    llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll<br>
<br>
Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=236758&r1=236757&r2=236758&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=236758&r1=236757&r2=236758&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original)<br>
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Thu May  7 13:33:50 2015<br>
@@ -1401,10 +1401,11 @@ public:<br>
 class ConstantSDNode : public SDNode {<br>
   const ConstantInt *Value;<br>
   friend class SelectionDAG;<br>
+  // XXX: DebugLoc is unused intentionally until constant coalescing is resolved<br>
   ConstantSDNode(bool isTarget, bool isOpaque, const ConstantInt *val,<br>
-                 DebugLoc DL, EVT VT)<br>
+                 DebugLoc, EVT VT)<br>
     : SDNode(isTarget ? ISD::TargetConstant : ISD::Constant,<br>
-             0, DL, getSDVTList(VT)), Value(val) {<br>
+             0, DebugLoc(), getSDVTList(VT)), Value(val) {<br>
     SubclassData |= (uint16_t)isOpaque;<br>
   }<br>
 public:<br>
<br>
Modified: llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll?rev=236758&r1=236757&r2=236758&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll?rev=236758&r1=236757&r2=236758&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll Thu May  7 13:33:50 2015<br>
@@ -1,4 +1,6 @@<br>
 ; RUN: llc -filetype=asm %s -o - | FileCheck %s<br>
+; XFAIL: *<br>
+; disabled until constant coalescing is resolved<br>
<br>
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"<br>
 target triple = "aarch64--linux-gnueabihf"<br>
<br>
Modified: llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll?rev=236758&r1=236757&r2=236758&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll?rev=236758&r1=236757&r2=236758&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll Thu May  7 13:33:50 2015<br>
@@ -1,4 +1,6 @@<br>
 ; RUN: llc -filetype=asm %s -o - | FileCheck %s<br>
+; XFAIL: *<br>
+; disabled until constant coalescing is resolved<br>
<br>
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"<br>
 target triple = "armv7--linux-gnueabihf"<br>
<br>
Modified: llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll?rev=236758&r1=236757&r2=236758&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll?rev=236758&r1=236757&r2=236758&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll Thu May  7 13:33:50 2015<br>
@@ -1,5 +1,7 @@<br>
 ; RUN: llc -debug < %s 2>&1 | FileCheck %s<br>
 ; REQUIRES: asserts<br>
+; XFAIL: *<br>
+; disabled until constant coalescing is resolved<br>
<br>
 ; CHECK: 0x{{[0-9,a-f]+}}: i32 = Constant<-1>test.c:4:5<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>