Merge "Fix use before set bug in arm32 guest." into main am: 5f6524e9cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3403428
Change-Id: Ic4fe17dd0fd9c2962c5cbe8908891eeef78d3f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index 00b861a..7d3830c 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -546,10 +546,10 @@
#else
case NATIVE_BRIDGE_ARCH_ARM: {
unwindstack::arm_user_regs arm_user_regs = {};
- regs->reset(unwindstack::RegsArm::Read(&arm_user_regs));
for (size_t i = 0; i < unwindstack::ARM_REG_LAST; i++) {
arm_user_regs.regs[i] = guest_regs.regs_arm.r[i];
}
+ regs->reset(unwindstack::RegsArm::Read(&arm_user_regs));
g_guest_arch = Architecture::ARM32;
break;