[llvm-commits] [llvm] r114681 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

[İsmail Dönmez]

This possibly fixed http://llvm.org/bugs/show_bug.cgi?id=8212 too .

On Thu, Sep 23, 2010 at 9:32 PM, Evan Cheng <evan.cheng at apple.com> wrote:

> Author: evancheng
> Date: Thu Sep 23 13:32:19 2010
> New Revision: 114681
>
> URL: http://llvm.org/viewvc/llvm-project?rev=114681&view=rev
> Log:
> Revert 114634 for now since buildbot claim it broke Clang self-hosting. I
> doubt it but it's possible it's exposing another bug somewhere.
>
> Modified:
>    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=114681&r1=114680&r2=114681&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Sep 23
> 13:32:19 2010
> @@ -1617,8 +1617,9 @@
>                                 MVT::Other, CopyTo, RangeCmp,
>                                 DAG.getBasicBlock(B.Default));
>
> -  BrRange = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, CopyTo,
> -                        DAG.getBasicBlock(MBB));
> +  if (MBB != NextBlock)
> +    BrRange = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, CopyTo,
> +                          DAG.getBasicBlock(MBB));
>
>   DAG.setRoot(BrRange);
>  }
> @@ -1671,8 +1672,9 @@
>   if (++BBI != FuncInfo.MF->end())
>     NextBlock = BBI;
>
> -  BrAnd = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, BrAnd,
> -                      DAG.getBasicBlock(NextMBB));
> +  if (NextMBB != NextBlock)
> +    BrAnd = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, BrAnd,
> +                        DAG.getBasicBlock(NextMBB));
>
>   DAG.setRoot(BrAnd);
>  }
>
>
> _______________________________________________
> 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/20100923/1233d2fd/attachment.html>