diff options
| author | Krzysztof Parzyszek <kparzysz@codeaurora.org> | 2016-07-28 20:25:21 +0000 |
|---|---|---|
| committer | Krzysztof Parzyszek <kparzysz@codeaurora.org> | 2016-07-28 20:25:21 +0000 |
| commit | 6400dec5ab7b2e14fec344150484c30e6d1d4c9e (patch) | |
| tree | 49bacea22e4bb285484a0d6ccecf8fce2b38d95a | |
| parent | 93320393a423334f81197cb107aa12fbc23b58aa (diff) | |
| download | bcm5719-llvm-6400dec5ab7b2e14fec344150484c30e6d1d4c9e.tar.gz bcm5719-llvm-6400dec5ab7b2e14fec344150484c30e6d1d4c9e.zip | |
Fix build breaks after r277028
llvm-svn: 277031
| -rw-r--r-- | llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Generic/MachineBranchProb.ll | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp b/llvm/lib/Target/Hexagon/HexagonConstPropagation.cpp index 930e2f7766f..ec274649cc5 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 e7021504999..921fa62c1c4 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: |
