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

[Eric Christopher]

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).

-eric

On Thu, May 7, 2015 at 11:43 AM Sergey Dmitrouk <sdmitrouk at accesssoftek.com>
wrote:

> 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
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150507/10d65562/attachment.html>