Skip to content

Commit e6b9366

Browse files
kddnewtonmeta-codesync[bot]
authored andcommitted
Remove unnecessary argument from loadTState
Summary: loadTState does not actually need the register preserver, as it is only used around the calls. Reviewed By: alexmalyshev Differential Revision: D86788147 fbshipit-source-id: 5e31f8c677089587025d0dc76279c097294e3c3e
1 parent 64ab095 commit e6b9366

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

cinderx/Jit/codegen/frame_asm.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ void initThreadStateOffset() {
8989
tstate_offset_inited = true;
9090
}
9191

92-
void FrameAsm::loadTState(
93-
const arch::Gp& dst_reg,
94-
[[maybe_unused]] RegisterPreserver& preserver) {
92+
void FrameAsm::loadTState(const arch::Gp& dst_reg) {
9593
#if defined(CINDER_X86_64)
9694
if (tstate_offset != -1) {
9795
asmjit::x86::Mem tls(tstate_offset);
@@ -224,7 +222,7 @@ void FrameAsm::linkLightWeightFunctionFrame(
224222
if (tstate_offset == -1) {
225223
preserver.preserve();
226224
}
227-
loadTState(tstate_reg, preserver);
225+
loadTState(tstate_reg);
228226

229227
if (tstate_offset == -1) {
230228
preserver.restore();
@@ -405,9 +403,7 @@ void FrameAsm::linkNormalFrame(
405403
#endif
406404

407405
#if PY_VERSION_HEX < 0x030C0000
408-
void FrameAsm::loadTState(
409-
const arch::Gp& dst_reg,
410-
RegisterPreserver& preserver) {
406+
void FrameAsm::loadTState(const arch::Gp& dst_reg) {
411407
#if defined(CINDER_X86_64)
412408
uint64_t tstate =
413409
reinterpret_cast<uint64_t>(&_PyRuntime.gilstate.tstate_current);
@@ -431,7 +427,7 @@ void FrameAsm::generateLinkFrame(
431427
RegisterPreserver preserver(as_, save_regs);
432428

433429
auto load_tstate_and_move = [&]() {
434-
loadTState(tstate_reg, preserver);
430+
loadTState(tstate_reg);
435431
preserver.remap();
436432
};
437433

cinderx/Jit/codegen/frame_asm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class FrameAsm {
5959
void* val,
6060
const arch::Gp& scratch);
6161

62-
void loadTState(const arch::Gp& dst_reg, RegisterPreserver& preserver);
62+
void loadTState(const arch::Gp& dst_reg);
6363
void linkNormalGeneratorFrame(
6464
RegisterPreserver& preserver,
6565
const arch::Gp& func_reg,

0 commit comments

Comments
 (0)