From 6400dec5ab7b2e14fec344150484c30e6d1d4c9e Mon Sep 17 00:00:00 2001 From: Krzysztof Parzyszek Date: Thu, 28 Jul 2016 20:25:21 +0000 Subject: [PATCH] Fix build breaks after r277028 llvm-svn: 277031 --- llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp | 1 + llvm/test/CodeGen/Generic/MachineBranchProb.ll | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp b/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp index 930e2f7766f3..ec274649cc53 100644 --- a/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp +++ b/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp @@ -1592,6 +1592,7 @@ bool MachineConstEvaluator::evaluateZEXTr(const Register &R1, unsigned Width, bool MachineConstEvaluator::evaluateZEXTi(const APInt &A1, unsigned Width, unsigned Bits, APInt &Result) { unsigned BW = A1.getBitWidth(); + (void)BW; assert(Width >= Bits && BW >= Bits); APInt Mask = APInt::getLowBitsSet(Width, Bits); Result = A1.zextOrTrunc(Width) & Mask; diff --git a/llvm/test/CodeGen/Generic/MachineBranchProb.ll b/llvm/test/CodeGen/Generic/MachineBranchProb.ll index e70215049995..921fa62c1c43 100644 --- a/llvm/test/CodeGen/Generic/MachineBranchProb.ll +++ b/llvm/test/CodeGen/Generic/MachineBranchProb.ll @@ -1,9 +1,12 @@ ; RUN: llc < %s -print-machineinstrs=expand-isel-pseudos -o /dev/null 2>&1 | FileCheck %s ; ARM & AArch64 run an extra SimplifyCFG which disrupts this test. -; Hexagon crashes (PR23377) ; XFAIL: arm,aarch64 +; Hexagon runs passes that renumber the basic blocks, causing this test +; to fail. +; XFAIL: hexagon + ; Make sure we have the correct weight attached to each successor. define i32 @test2(i32 %x) nounwind uwtable readnone ssp { ; CHECK-LABEL: Machine code for function test2: