Skip to content

[LLDB] Fix error returns in CastToBasicType and CastToEnumType in ValueObject. #117401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2024
Merged

[LLDB] Fix error returns in CastToBasicType and CastToEnumType in ValueObject. #117401

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6051ed
[LLDB] Fix error returns in CastToBasicType and CastToEnumType in Val…
cmtice Nov 22, 2024
5cfd97e
Fix clang-format errors.
cmtice Nov 25, 2024
0cbce74
Clean up code & remove unnecessary extra variables.
cmtice Dec 3, 2024
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
87 changes: 53 additions & 34 deletions lldb/source/ValueObject/ValueObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3194,16 +3194,19 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
GetCompilerType().IsPointerType() || GetCompilerType().IsNullPtrType();
bool is_float = GetCompilerType().IsFloat();
bool is_integer = GetCompilerType().IsInteger();
ExecutionContext exe_ctx(GetExecutionContextRef());

if (!type.IsScalarType()) {
m_error = Status::FromErrorString("target type must be a scalar");
return GetSP();
Status error = Status::FromErrorString("target type must be a scalar");
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
Copy link
Collaborator

@labath labath Dec 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Status error = Status::FromErrorString("target type must be a scalar");
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), Status::FromErrorString("target type must be a scalar"));

If you really want to have a variable for this, then you can keep what you have and use std::move instead of Clone, but I think this is better (and I think Adrian would agree :) ).

This comment applies throughout the patch.

Copy link
Contributor Author

@cmtice cmtice Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

}

if (!is_scalar && !is_enum && !is_pointer) {
m_error =
Status error =
Status::FromErrorString("argument must be a scalar, enum, or pointer");
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}

lldb::TargetSP target = GetTargetSP();
Expand All @@ -3216,14 +3219,16 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {

if (is_pointer) {
if (!type.IsInteger() && !type.IsBoolean()) {
m_error =
Status error =
Status::FromErrorString("target type must be an integer or boolean");
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
if (!type.IsBoolean() && type_byte_size < val_byte_size) {
m_error = Status::FromErrorString(
Status error = Status::FromErrorString(
"target type cannot be smaller than the pointer type");
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
}

Expand All @@ -3237,10 +3242,11 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromBool(
target, !float_value_or_err->isZero(), "result");
else {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"cannot get value as APFloat: %s",
llvm::toString(float_value_or_err.takeError()).c_str());
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
}
}
Expand All @@ -3256,11 +3262,12 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPInt(target, ext, type,
"result");
} else {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(int_value_or_err.takeError()).c_str());
;
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
} else if (is_scalar && is_float) {
llvm::APSInt integer(type_byte_size * CHAR_BIT, !type.IsSigned());
Expand All @@ -3274,10 +3281,11 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
// Casting floating point values that are out of bounds of the target
// type is undefined behaviour.
if (status & llvm::APFloatBase::opInvalidOp) {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"invalid type cast detected: %s",
llvm::toString(float_value_or_err.takeError()).c_str());
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
return ValueObject::CreateValueObjectFromAPInt(target, integer, type,
"result");
Expand All @@ -3297,10 +3305,11 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPFloat(target, f, type,
"result");
} else {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(int_value_or_err.takeError()).c_str());
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
} else {
if (is_integer) {
Expand All @@ -3312,10 +3321,11 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPFloat(target, f, type,
"result");
} else {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(int_value_or_err.takeError()).c_str());
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
}
if (is_float) {
Expand All @@ -3327,33 +3337,38 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPFloat(target, f, type,
"result");
} else {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"cannot get value as APFloat: %s",
llvm::toString(float_value_or_err.takeError()).c_str());
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
}
}
}

m_error = Status::FromErrorString("Unable to perform requested cast");
return GetSP();
Status error = Status::FromErrorString("Unable to perform requested cast");
return ValueObjectConstResult::Create(exe_ctx.GetBestExecutionContextScope(),
error.Clone());
}

lldb::ValueObjectSP ValueObject::CastToEnumType(CompilerType type) {
bool is_enum = GetCompilerType().IsEnumerationType();
bool is_integer = GetCompilerType().IsInteger();
bool is_float = GetCompilerType().IsFloat();
ExecutionContext exe_ctx(GetExecutionContextRef());

if (!is_enum && !is_integer && !is_float) {
m_error = Status::FromErrorString(
Status error = Status::FromErrorString(
"argument must be an integer, a float, or an enum");
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}

if (!type.IsEnumerationType()) {
m_error = Status::FromErrorString("target type must be an enum");
return GetSP();
Status error = Status::FromErrorString("target type must be an enum");
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}

lldb::TargetSP target = GetTargetSP();
Expand All @@ -3372,16 +3387,18 @@ lldb::ValueObjectSP ValueObject::CastToEnumType(CompilerType type) {
// Casting floating point values that are out of bounds of the target
// type is undefined behaviour.
if (status & llvm::APFloatBase::opInvalidOp) {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"invalid type cast detected: %s",
llvm::toString(value_or_err.takeError()).c_str());
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
return ValueObject::CreateValueObjectFromAPInt(target, integer, type,
"result");
} else {
m_error = Status::FromErrorString("cannot get value as APFloat");
return GetSP();
Status error = Status::FromErrorString("cannot get value as APFloat");
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
} else {
// Get the value as APSInt and extend or truncate it to the requested size.
Expand All @@ -3391,14 +3408,16 @@ lldb::ValueObjectSP ValueObject::CastToEnumType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPInt(target, ext, type,
"result");
} else {
m_error = Status::FromErrorStringWithFormat(
Status error = Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(value_or_err.takeError()).c_str());
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(), error.Clone());
}
}
m_error = Status::FromErrorString("Cannot perform requested cast");
return GetSP();
Status error = Status::FromErrorString("Cannot perform requested cast");
return ValueObjectConstResult::Create(exe_ctx.GetBestExecutionContextScope(),
error.Clone());
}

ValueObject::EvaluationPoint::EvaluationPoint() : m_mod_id(), m_exe_ctx_ref() {}
Expand Down
Loading