Skip to content

Commit 29c91c8

Browse files
committed
Fix tests after rebase
1 parent fa4f923 commit 29c91c8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

llvm/test/CodeGen/AArch64/GlobalISel/ptrauth-constant-in-code.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ define void @store_signed_const_local(ptr %dest) {
101101
; ISEL-MIR: body:
102102
; ISEL-MIR: %0:gpr64common = COPY $x0
103103
; ISEL-MIR-NEXT: %10:gpr64common = MOVaddr target-flags(aarch64-page) @const_table_local + 8, target-flags(aarch64-pageoff, aarch64-nc) @const_table_local + 8
104-
; ISEL-MIR-NEXT: %2:gpr64common = PAUTH_BLEND %0, 1234
104+
; ISEL-MIR-NEXT: %2:gpr64common = MOVKXi %0, 1234, 48
105105
; ISEL-MIR-NEXT: %15:gpr64noip = COPY %2
106106
; ISEL-MIR-NEXT: MOVaddrPAC @const_table_local + 8, 2, %15, 0, implicit-def $x16, implicit-def $x17
107107
; ISEL-MIR-NEXT: %4:gpr64 = COPY $x16
@@ -135,7 +135,7 @@ define void @store_signed_const_got(ptr %dest) {
135135
; ISEL-MIR-ELF: %0:gpr64common = COPY $x0
136136
; ISEL-MIR-ELF-NEXT: %7:gpr64common = LOADgotAUTH target-flags(aarch64-got) @const_table_got
137137
; ISEL-MIR-ELF-NEXT: %6:gpr64common = ADDXri %7, 8, 0
138-
; ISEL-MIR-ELF-NEXT: %2:gpr64common = PAUTH_BLEND %0, 1234
138+
; ISEL-MIR-ELF-NEXT: %2:gpr64common = MOVKXi %0, 1234, 48
139139
; ISEL-MIR-ELF-NEXT: %12:gpr64noip = COPY %2
140140
; ISEL-MIR-ELF-NEXT: LOADgotPAC target-flags(aarch64-got) @const_table_got + 8, 2, %12, 0, implicit-def $x16, implicit-def $x17, implicit-def $nzcv
141141
; ISEL-MIR-ELF-NEXT: %4:gpr64 = COPY $x16
@@ -174,7 +174,7 @@ define void @store_signed_arg(ptr %dest, ptr %p) {
174174
; ISEL-MIR: body:
175175
; ISEL-MIR: %0:gpr64common = COPY $x0
176176
; ISEL-MIR-NEXT: %1:gpr64common = COPY $x1
177-
; ISEL-MIR-NEXT: %3:gpr64common = PAUTH_BLEND %0, 1234
177+
; ISEL-MIR-NEXT: %3:gpr64common = MOVKXi %0, 1234, 48
178178
; ISEL-MIR-NEXT: %6:gpr64common = ADDXri %1, 8, 0
179179
; Check that no implicit defs are added to PACDA instruction.
180180
; ISEL-MIR-NEXT: %8:gpr64 = PACDA %6, %3{{$}}
@@ -185,8 +185,8 @@ define void @store_signed_arg(ptr %dest, ptr %p) {
185185
; ISEL-ASM-LABEL: store_signed_arg:
186186
; ISEL-ASM-NEXT: .cfi_startproc
187187
; ISEL-ASM-NEXT: mov x8, x0
188-
; ISEL-ASM-NEXT: movk x8, #1234, lsl #48
189188
; ISEL-ASM-NEXT: add x9, x1, #8
189+
; ISEL-ASM-NEXT: movk x8, #1234, lsl #48
190190
; ISEL-ASM-NEXT: pacda x9, x8
191191
; ISEL-ASM-NEXT: str x9, [x0]
192192
; ISEL-ASM-NEXT: ret

llvm/test/CodeGen/AArch64/ptrauth-constant-in-code.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ define void @store_signed_const_local(ptr %dest) {
8787
; ISEL-MIR-LABEL: name: store_signed_const_local
8888
; ISEL-MIR: body:
8989
; ISEL-MIR: %0:gpr64common = COPY $x0
90-
; ISEL-MIR-NEXT: %1:gpr64common = PAUTH_BLEND %0, 1234
90+
; ISEL-MIR-NEXT: %1:gpr64common = MOVKXi %0, 1234, 48
9191
; ISEL-MIR-NEXT: %2:gpr64common = MOVaddr target-flags(aarch64-page) @const_table_local + 8, target-flags(aarch64-pageoff, aarch64-nc) @const_table_local + 8
9292
; ISEL-MIR-NEXT: %4:gpr64noip = COPY %1
9393
; ISEL-MIR-NEXT: MOVaddrPAC @const_table_local + 8, 2, %4, 0, implicit-def $x16, implicit-def $x17
@@ -119,7 +119,7 @@ define void @store_signed_const_got(ptr %dest) {
119119
; ISEL-MIR-ELF-LABEL: name: store_signed_const_got
120120
; ISEL-MIR-ELF: body:
121121
; ISEL-MIR-ELF: %0:gpr64common = COPY $x0
122-
; ISEL-MIR-ELF-NEXT: %1:gpr64common = PAUTH_BLEND %0, 1234
122+
; ISEL-MIR-ELF-NEXT: %1:gpr64common = MOVKXi %0, 1234, 48
123123
; ISEL-MIR-ELF-NEXT: %2:gpr64common = LOADgotAUTH target-flags(aarch64-got) @const_table_got, implicit-def dead $x16, implicit-def dead $x17, implicit-def dead $nzcv
124124
; ISEL-MIR-ELF-NEXT: %3:gpr64common = ADDXri killed %2, 8, 0
125125
; ISEL-MIR-ELF-NEXT: %5:gpr64noip = COPY %1
@@ -159,7 +159,7 @@ define void @store_signed_arg(ptr %dest, ptr %p) {
159159
; ISEL-MIR: body:
160160
; ISEL-MIR: %1:gpr64common = COPY $x1
161161
; ISEL-MIR-NEXT: %0:gpr64common = COPY $x0
162-
; ISEL-MIR-NEXT: %2:gpr64common = PAUTH_BLEND %0, 1234
162+
; ISEL-MIR-NEXT: %2:gpr64common = MOVKXi %0, 1234, 48
163163
; ISEL-MIR-NEXT: %3:gpr64common = ADDXri %1, 8, 0
164164
; Check that no implicit defs are added to PACDA instruction.
165165
; ISEL-MIR-NEXT: %4:gpr64 = PACDA %3, killed %2{{$}}
@@ -169,8 +169,8 @@ define void @store_signed_arg(ptr %dest, ptr %p) {
169169
; ISEL-ASM-LABEL: store_signed_arg:
170170
; ISEL-ASM-NEXT: .cfi_startproc
171171
; ISEL-ASM-NEXT: mov x8, x0
172-
; ISEL-ASM-NEXT: movk x8, #1234, lsl #48
173172
; ISEL-ASM-NEXT: add x9, x1, #8
173+
; ISEL-ASM-NEXT: movk x8, #1234, lsl #48
174174
; ISEL-ASM-NEXT: pacda x9, x8
175175
; ISEL-ASM-NEXT: str x9, [x0]
176176
; ISEL-ASM-NEXT: ret

0 commit comments

Comments
 (0)