<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Hi,</div><div class=""><br class=""></div>This commit breaks buildbots (see e.g. <a href="http://lab.llvm.org:8080/green/job/clang-stage2-cmake-RgSan_check/1053/console" class="">http://lab.llvm.org:8080/green/job/clang-stage2-cmake-RgSan_check/1053/console</a>), could you please revert and recommit when the issue is fixed?<div class=""><br class=""></div><div class="">Thanks,</div><div class="">Michael</div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Jan 8, 2016, at 11:30 PM, Junmo Park via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Author: flyingforyou<br class="">Date: Sat Jan 9 01:30:13 2016<br class="">New Revision: 257253<br class=""><br class="">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=257253&view=rev" class="">http://llvm.org/viewvc/llvm-project?rev=257253&view=rev</a><br class="">Log:<br class="">[BranchFolding] Set correct mem refs<br class=""><br class="">Merge MBBICommon and MBBI's MMOs.<br class=""><br class="">Differential Revision: <a href="http://reviews.llvm.org/D15990" class="">http://reviews.llvm.org/D15990</a><br class=""><br class="">Added:<br class=""> llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll<br class="">Modified:<br class=""> llvm/trunk/lib/CodeGen/BranchFolding.cpp<br class=""><br class="">Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=257253&r1=257252&r2=257253&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=257253&r1=257252&r2=257253&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/CodeGen/BranchFolding.cpp (original)<br class="">+++ llvm/trunk/lib/CodeGen/BranchFolding.cpp Sat Jan 9 01:30:13 2016<br class="">@@ -780,7 +780,7 @@ removeMMOsFromMemoryOperations(MachineBa<br class=""> assert(MBBICommon->isIdenticalTo(&*MBBI) && "Expected matching MIIs!");<br class=""><br class=""> if (MBBICommon->mayLoad() || MBBICommon->mayStore())<br class="">- MBBICommon->setMemRefs(MBBI->mergeMemRefsWith(*MBBI));<br class="">+ MBBICommon->setMemRefs(MBBICommon->mergeMemRefsWith(*MBBI));<br class=""><br class=""> ++MBBI;<br class=""> ++MBBICommon;<br class=""><br class="">Added: llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll?rev=257253&view=auto" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll?rev=257253&view=auto</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll (added)<br class="">+++ llvm/trunk/test/CodeGen/AArch64/branch-folder-merge-mmos.ll Sat Jan 9 01:30:13 2016<br class="">@@ -0,0 +1,53 @@<br class="">+; RUN: opt < %s -O3 | llc -march=aarch64 -mtriple=aarch64-none-linux-gnu -stop-after branch-folder -o /dev/null | FileCheck %s<br class="">+target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128"<br class="">+<br class="">+; Function Attrs: nounwind<br class="">+define void @test(float* %test_arr) #0 {<br class="">+entry:<br class="">+ %test_arr.addr = alloca float*, align 8<br class="">+ store float* %test_arr, float** %test_arr.addr, align 8<br class="">+ %0 = load float*, float** %test_arr.addr, align 8<br class="">+ %arrayidx = getelementptr inbounds float, float* %0, i64 0<br class="">+ %1 = load float, float* %arrayidx, align 4<br class="">+ %2 = load float*, float** %test_arr.addr, align 8<br class="">+ %arrayidx1 = getelementptr inbounds float, float* %2, i64 1<br class="">+ %3 = load float, float* %arrayidx1, align 4<br class="">+ %sub = fsub float %1, %3<br class="">+ %4 = load float*, float** %test_arr.addr, align 8<br class="">+ %arrayidx2 = getelementptr inbounds float, float* %4, i64 0<br class="">+ store float %sub, float* %arrayidx2, align 4<br class="">+ ret void<br class="">+}<br class="">+<br class="">+; Function Attrs: nounwind<br class="">+define void @foo(i32 %a, i32 %b, float* %foo_arr) #0 {<br class="">+; CHECK: (load 4 from %ir.arrayidx1.i2), (load 4 from %ir.arrayidx1.i)<br class="">+entry:<br class="">+ %a.addr = alloca i32, align 4<br class="">+ %b.addr = alloca i32, align 4<br class="">+ %foo_arr.addr = alloca float*, align 8<br class="">+ store i32 %a, i32* %a.addr, align 4<br class="">+ store i32 %b, i32* %b.addr, align 4<br class="">+ store float* %foo_arr, float** %foo_arr.addr, align 8<br class="">+ %0 = load i32, i32* %a.addr, align 4<br class="">+ %cmp = icmp sgt i32 %0, 0<br class="">+ br i1 %cmp, label %if.then, label %if.end<br class="">+<br class="">+if.then: ; preds = %entry<br class="">+ %1 = load float*, float** %foo_arr.addr, align 8<br class="">+ call void @test(float* %1)<br class="">+ br label %if.end3<br class="">+<br class="">+if.end: ; preds = %entry<br class="">+ %2 = load i32, i32* %b.addr, align 4<br class="">+ %cmp1 = icmp sgt i32 %2, 0<br class="">+ br i1 %cmp1, label %if.then2, label %if.end3<br class="">+<br class="">+if.then2: ; preds = %if.end<br class="">+ %3 = load float*, float** %foo_arr.addr, align 8<br class="">+ call void @test(float* %3)<br class="">+ br label %if.end3<br class="">+<br class="">+if.end3: ; preds = %if.then, %if.then2, %if.end<br class="">+ ret void<br class="">+}<br class=""><br class=""><br class="">_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits<br class=""></div></div></blockquote></div><br class=""></div></body></html>