Skip to content

Commit 48ee42e

Browse files
tnachenjameysharp
andauthored
Refactor Sigdata methods with sigset (#5307)
* Refactor sigdata methods * Update cranelift/codegen/src/machinst/abi.rs Co-authored-by: Jamey Sharp <[email protected]> * Address comments Co-authored-by: Jamey Sharp <[email protected]>
1 parent 6ce2ac1 commit 48ee42e

File tree

3 files changed

+175
-170
lines changed

3 files changed

+175
-170
lines changed

cranelift/codegen/src/isa/s390x/lower/isle.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, Flags, IsaFlags, 6>
129129
for i in 0..self.lower_ctx.sigs()[*abi].num_rets() {
130130
if let &ABIArg::Slots {
131131
ref slots, purpose, ..
132-
} = &self.lower_ctx.sigs()[*abi].get_ret(self.lower_ctx.sigs(), i)
132+
} = &self.lower_ctx.sigs().get_ret(*abi, i)
133133
{
134134
if purpose == ArgumentPurpose::StructReturn {
135135
continue;
@@ -192,8 +192,10 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, Flags, IsaFlags, 6>
192192
defs: &CallRetList,
193193
opcode: &Opcode,
194194
) -> BoxCallInfo {
195-
let clobbers =
196-
self.lower_ctx.sigs()[*abi].call_clobbers::<S390xMachineDeps>(self.lower_ctx.sigs());
195+
let clobbers = self
196+
.lower_ctx
197+
.sigs()
198+
.call_clobbers::<S390xMachineDeps>(*abi);
197199
Box::new(CallInfo {
198200
dest: name.clone(),
199201
uses: uses.clone(),
@@ -214,8 +216,10 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, Flags, IsaFlags, 6>
214216
defs: &CallRetList,
215217
opcode: &Opcode,
216218
) -> BoxCallIndInfo {
217-
let clobbers =
218-
self.lower_ctx.sigs()[*abi].call_clobbers::<S390xMachineDeps>(self.lower_ctx.sigs());
219+
let clobbers = self
220+
.lower_ctx
221+
.sigs()
222+
.call_clobbers::<S390xMachineDeps>(*abi);
219223
Box::new(CallIndInfo {
220224
rn: target,
221225
uses: uses.clone(),

0 commit comments

Comments
 (0)