fixup! [lldb] Add isConstant mode for FA locations

felipepiovezan · felipepiovezan · commit a4b409d2baa3 · 2024-10-01T12:20:17.000-07:00
diff --git a/lldb/source/Target/RegisterContextUnwind.cpp b/lldb/source/Target/RegisterContextUnwind.cpp
@@ -2090,7 +2090,8 @@ bool RegisterContextUnwind::ReadFrameAddress(
   }
   case UnwindPlan::Row::FAValue::isConstant: {
     address = fa.GetConstant();
-    address = abi_sp->FixCodeAddress(address);
+    if (abi_sp)
+      address = abi_sp->FixCodeAddress(address);
     UnwindLogMsg("CFA value set by constant is 0x%" PRIx64, address);
     return true;
   }

Original file line number	Diff line number	Diff line change
`@@ -2090,7 +2090,8 @@ bool RegisterContextUnwind::ReadFrameAddress(`
`2090`	`2090`	`}`
`2091`	`2091`	`case UnwindPlan::Row::FAValue::isConstant: {`
`2092`	`2092`	`address = fa.GetConstant();`
`2093`		`- address = abi_sp->FixCodeAddress(address);`
	`2093`	`+ if (abi_sp)`
	`2094`	`+ address = abi_sp->FixCodeAddress(address);`
`2094`	`2095`	`UnwindLogMsg("CFA value set by constant is 0x%" PRIx64, address);`
`2095`	`2096`	`return true;`
`2096`	`2097`	`}`