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 all 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
162 changes: 83 additions & 79 deletions lldb/source/ValueObject/ValueObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3194,17 +3194,17 @@ 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();
}
if (!type.IsScalarType())
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorString("target type must be a scalar"));

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

lldb::TargetSP target = GetTargetSP();
uint64_t type_byte_size = 0;
Expand All @@ -3215,16 +3215,15 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
val_byte_size = temp.value();

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

if (type.IsBoolean()) {
Expand All @@ -3236,12 +3235,12 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
if (float_value_or_err)
return ValueObject::CreateValueObjectFromBool(
target, !float_value_or_err->isZero(), "result");
else {
m_error = Status::FromErrorStringWithFormat(
"cannot get value as APFloat: %s",
llvm::toString(float_value_or_err.takeError()).c_str());
return GetSP();
}
else
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorStringWithFormat(
"cannot get value as APFloat: %s",
llvm::toString(float_value_or_err.takeError()).c_str()));
}
}

Expand All @@ -3255,13 +3254,12 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
int_value_or_err->extOrTrunc(type_byte_size * CHAR_BIT);
return ValueObject::CreateValueObjectFromAPInt(target, ext, type,
"result");
} else {
m_error = Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(int_value_or_err.takeError()).c_str());
;
return GetSP();
}
} else
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(int_value_or_err.takeError()).c_str()));
} else if (is_scalar && is_float) {
llvm::APSInt integer(type_byte_size * CHAR_BIT, !type.IsSigned());
bool is_exact;
Expand All @@ -3273,12 +3271,12 @@ 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(
"invalid type cast detected: %s",
llvm::toString(float_value_or_err.takeError()).c_str());
return GetSP();
}
if (status & llvm::APFloatBase::opInvalidOp)
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorStringWithFormat(
"invalid type cast detected: %s",
llvm::toString(float_value_or_err.takeError()).c_str()));
return ValueObject::CreateValueObjectFromAPInt(target, integer, type,
"result");
}
Expand All @@ -3297,10 +3295,11 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPFloat(target, f, type,
"result");
} else {
m_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(),
Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(int_value_or_err.takeError()).c_str()));
}
} else {
if (is_integer) {
Expand All @@ -3312,10 +3311,11 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPFloat(target, f, type,
"result");
} else {
m_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(),
Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(int_value_or_err.takeError()).c_str()));
}
}
if (is_float) {
Expand All @@ -3327,34 +3327,37 @@ lldb::ValueObjectSP ValueObject::CastToBasicType(CompilerType type) {
return ValueObject::CreateValueObjectFromAPFloat(target, f, type,
"result");
} else {
m_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(),
Status::FromErrorStringWithFormat(
"cannot get value as APFloat: %s",
llvm::toString(float_value_or_err.takeError()).c_str()));
}
}
}
}

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

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(
"argument must be an integer, a float, or an enum");
return GetSP();
}
if (!is_enum && !is_integer && !is_float)
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorString(
"argument must be an integer, a float, or an enum"));

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

lldb::TargetSP target = GetTargetSP();
uint64_t byte_size = 0;
Expand All @@ -3371,34 +3374,35 @@ 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(
"invalid type cast detected: %s",
llvm::toString(value_or_err.takeError()).c_str());
return GetSP();
}
if (status & llvm::APFloatBase::opInvalidOp)
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorStringWithFormat(
"invalid type cast detected: %s",
llvm::toString(value_or_err.takeError()).c_str()));
return ValueObject::CreateValueObjectFromAPInt(target, integer, type,
"result");
} else {
m_error = Status::FromErrorString("cannot get value as APFloat");
return GetSP();
}
} else
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorString("cannot get value as APFloat"));
} else {
// Get the value as APSInt and extend or truncate it to the requested size.
auto value_or_err = GetValueAsAPSInt();
if (value_or_err) {
llvm::APSInt ext = value_or_err->extOrTrunc(byte_size * CHAR_BIT);
return ValueObject::CreateValueObjectFromAPInt(target, ext, type,
"result");
} else {
m_error = Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(value_or_err.takeError()).c_str());
return GetSP();
}
} else
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorStringWithFormat(
"cannot get value as APSInt: %s",
llvm::toString(value_or_err.takeError()).c_str()));
}
m_error = Status::FromErrorString("Cannot perform requested cast");
return GetSP();
return ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
Status::FromErrorString("Cannot perform requested cast"));
}

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