Skip to content

Commit ad5e2bf

Browse files
authored
[llbd] Finish Turn lldb_private::Status into a value type. (#10616) (#112420)
Fix a few bare Status() invocations that were missed in the conversion. This is sufficent to build lldb on FreeBSD/aaarch64. Fixes: 0642cd7
1 parent 36d936a commit ad5e2bf

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm64.cpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,15 @@ NativeRegisterContextFreeBSD_arm64::ReadRegister(const RegisterInfo *reg_info,
119119
RegisterValue &reg_value) {
120120
Status error;
121121

122-
if (!reg_info) {
123-
error = Status::FromErrorString("reg_info NULL");
124-
return error;
125-
}
122+
if (!reg_info)
123+
return Status::FromErrorString("reg_info NULL");
126124

127125
const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
128126

129127
if (reg == LLDB_INVALID_REGNUM)
130-
return Status("no lldb regnum for %s", reg_info && reg_info->name
131-
? reg_info->name
132-
: "<unknown register>");
128+
return Status::FromErrorStringWithFormat(
129+
"no lldb regnum for %s",
130+
reg_info && reg_info->name ? reg_info->name : "<unknown register>");
133131

134132
uint32_t set = GetRegisterInfo().GetRegisterSetFromRegisterIndex(reg);
135133
error = ReadRegisterSet(set);
@@ -147,14 +145,14 @@ Status NativeRegisterContextFreeBSD_arm64::WriteRegister(
147145
Status error;
148146

149147
if (!reg_info)
150-
return Status("reg_info NULL");
148+
return Status::FromErrorString("reg_info NULL");
151149

152150
const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
153151

154152
if (reg == LLDB_INVALID_REGNUM)
155-
return Status("no lldb regnum for %s", reg_info && reg_info->name
156-
? reg_info->name
157-
: "<unknown register>");
153+
return Status::FromErrorStringWithFormat(
154+
"no lldb regnum for %s",
155+
reg_info && reg_info->name ? reg_info->name : "<unknown register>");
158156

159157
uint32_t set = GetRegisterInfo().GetRegisterSetFromRegisterIndex(reg);
160158
error = ReadRegisterSet(set);

0 commit comments

Comments
 (0)