[llvm] r277031 - Fix build breaks after r277028

[Krzysztof Parzyszek via llvm-commits]

Author: kparzysz
Date: Thu Jul 28 15:25:21 2016
New Revision: 277031

URL: http://llvm.org/viewvc/llvm-project?rev=277031&view=rev
Log:
Fix build breaks after r277028

Modified:
    llvm/trunk/lib/Target/Hexagon/HexagonConstPropagation.cpp
    llvm/trunk/test/CodeGen/Generic/MachineBranchProb.ll

Modified: llvm/trunk/lib/Target/Hexagon/HexagonConstPropagation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonConstPropagation.cpp?rev=277031&r1=277030&r2=277031&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonConstPropagation.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonConstPropagation.cpp Thu Jul 28 15:25:21 2016
@@ -1592,6 +1592,7 @@ bool MachineConstEvaluator::evaluateZEXT
 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;

Modified: llvm/trunk/test/CodeGen/Generic/MachineBranchProb.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/MachineBranchProb.ll?rev=277031&r1=277030&r2=277031&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Generic/MachineBranchProb.ll (original)
+++ llvm/trunk/test/CodeGen/Generic/MachineBranchProb.ll Thu Jul 28 15:25:21 2016
@@ -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: