[Hexagon] Fix an incorrect assertion in HexagonConstExtenders.cpp

Making sure that an instruction has fewer operands than required, then
attempting to access one out of range is going to fail.

llvm-svn: 316785
This commit is contained in:
Krzysztof Parzyszek 2017-10-27 18:52:28 +00:00
parent 857ac594b7
commit 92a2635bbd
2 changed files with 46 additions and 1 deletions

View File

@ -1759,7 +1759,7 @@ bool HCE::replaceInstr(unsigned Idx, Register ExtR, const ExtenderInit &ExtI) {
// Update offsets of the def's uses.
for (std::pair<MachineInstr*,unsigned> P : RegOps) {
unsigned J = P.second;
assert(P.first->getNumOperands() < J+1 &&
assert(P.first->getNumOperands() > J+1 &&
P.first->getOperand(J+1).isImm());
MachineOperand &ImmOp = P.first->getOperand(J+1);
ImmOp.setImm(ImmOp.getImm() + Diff);

View File

@ -0,0 +1,45 @@
# RUN: llc -march=hexagon -run-pass hexagon-cext-opt %s -o - | FileCheck %s
# An incorrect assertion was triggered on this code, while attempting to
# perform a valid transformation.
# CHECK: PS_jmpret
--- |
define void @fred() { ret void }
@array = global [1024 x i8] zeroinitializer, align 8
...
---
name: fred
tracksRegLiveness: true
registers:
- { id: 0, class: intregs }
- { id: 1, class: intregs }
- { id: 2, class: intregs }
- { id: 3, class: predregs }
- { id: 4, class: intregs }
- { id: 5, class: intregs }
- { id: 6, class: intregs }
- { id: 7, class: intregs }
- { id: 8, class: intregs }
- { id: 9, class: intregs }
body: |
bb.0:
liveins: %r0, %r1
%0 = COPY %r1
%1 = COPY %r0
%2 = A2_tfrsi @array
%3 = IMPLICIT_DEF
%4 = A2_tfrsi @array+424
%5 = M2_macsip %0, %1, 5
%6 = A2_addi %2, 704
%7 = A2_tfrsi 0
S4_pstorerif_rr %3, %6, %5, 2, %7
%8 = A2_tfrsi @array+144
%9 = C2_mux %3, %4, %8
S4_storeiri_io %9, 0, 0
PS_jmpret %r31, implicit-def %pc
...