Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

fix: address some cases where jumps were not being updated #83

Merged
mctavish merged 2 commits into from
Apr 4, 2023
Merged

fix: address some cases where jumps were not being updated #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d9fe3d
fix: address some cases where jumps were not being updated
mctavish Apr 3, 2023
e94e076
fix: remove unnecessary log statement
mctavish Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/googleclouddebugger/bytecode_manipulator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ static PythonOpcodeType GetOpcodeType(uint8_t opcode) {
#if PY_VERSION_HEX < 0x03080000
// Removed in Python 3.8.
case CONTINUE_LOOP:
#endif
#if PY_VERSION_HEX >= 0x03090000
case JUMP_IF_NOT_EXC_MATCH:
#endif
return BRANCH_ABSOLUTE_OPCODE;

Expand All @@ -144,10 +147,18 @@ static PythonOpcodeType GetOpcodeType(uint8_t opcode) {
static int GetBranchTarget(int offset, PythonInstruction instruction) {
switch (GetOpcodeType(instruction.opcode)) {
case BRANCH_DELTA_OPCODE:
#if PY_VERSION_HEX < 0x030A0000
return offset + instruction.size + instruction.argument;
#else
return offset + instruction.size + instruction.argument * 2;
#endif

case BRANCH_ABSOLUTE_OPCODE:
#if PY_VERSION_HEX < 0x030A0000
return instruction.argument;
#else
return instruction.argument * 2;
#endif

default:
DCHECK(false) << "Not a branch instruction";
Expand Down Expand Up @@ -428,13 +439,21 @@ static bool InsertAndUpdateBranchInstructions(
// argument of 0 even when it is not required. This needs to be taken
// into account when calculating the target of a branch instruction.
int inst_size = std::max(instruction.size, it->original_size);
#if PY_VERSION_HEX < 0x030A0000
int32_t target = it->current_offset + inst_size + arg;
#else
int32_t target = it->current_offset + inst_size + arg * 2;
#endif
need_to_update = it->current_offset < insertion.current_offset &&
insertion.current_offset < target;
} else if (opcode_type == BRANCH_ABSOLUTE_OPCODE) {
// For absolute branches, the argument needs to be updated if the
// insertion before the target.
#if PY_VERSION_HEX < 0x030A0000
need_to_update = insertion.current_offset < arg;
#else
need_to_update = insertion.current_offset < arg * 2;
#endif
}

// If we are inserting the original method call instructions, we want to
Expand Down