Skip to content

Commit ece4568

Browse files
author
git apple-llvm automerger
committed
Merge commit 'cfc4510f3dde' from apple/main into swift/next
2 parents 278b99b + cfc4510 commit ece4568

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3047,6 +3047,7 @@ static int getIntOperandFromRegisterString(StringRef RegString) {
30473047

30483048
assert(AllIntFields &&
30493049
"Unexpected non-integer value in special register string.");
3050+
(void)AllIntFields;
30503051

30513052
// Need to combine the integer fields of the string into a single value
30523053
// based on the bit encoding of MRS/MSR instruction.

llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,9 +2082,7 @@ bool AMDGPULegalizerInfo::legalizeFPTOI(MachineInstr &MI,
20822082
const LLT S32 = LLT::scalar(32);
20832083

20842084
const LLT SrcLT = MRI.getType(Src);
2085-
const LLT DstLT = MRI.getType(Dst);
2086-
2087-
assert((SrcLT == S32 || SrcLT == S64) && DstLT == S64);
2085+
assert((SrcLT == S32 || SrcLT == S64) && MRI.getType(Dst) == S64);
20882086

20892087
unsigned Flags = MI.getFlags();
20902088

llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5214,6 +5214,7 @@ static void getIntOperandsFromRegisterString(StringRef RegString,
52145214

52155215
assert(AllIntFields &&
52165216
"Unexpected non-integer value in special register string.");
5217+
(void)AllIntFields;
52175218
}
52185219
}
52195220

0 commit comments

Comments
 (0)