Author: cmtice Date: 2024-12-04T08:11:10-08:00 New Revision: ba43a102a929eb8aae60580e14f3192a705e1805
URL: https://github.com/llvm/llvm-project/commit/ba43a102a929eb8aae60580e14f3192a705e1805 DIFF: https://github.com/llvm/llvm-project/commit/ba43a102a929eb8aae60580e14f3192a705e1805.diff LOG: [LLDB] Fix error returns in CastToBasicType and CastToEnumType in ValueObject. (#117401) Update the error returns in ValueObject::CastToBasicType and ValueObject::CastToEnumType to create new errors and return a ValueObjectConstResult with the error, rather tnan updating the error in (and returning) the input ValueObject. Added: Modified: lldb/source/ValueObject/ValueObject.cpp Removed: ################################################################################ diff --git a/lldb/source/ValueObject/ValueObject.cpp b/lldb/source/ValueObject/ValueObject.cpp index 86172ad1b561f9..2864af107b925f 100644 --- a/lldb/source/ValueObject/ValueObject.cpp +++ b/lldb/source/ValueObject/ValueObject.cpp @@ -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; @@ -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()) { @@ -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())); } } @@ -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; @@ -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"); } @@ -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) { @@ -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) { @@ -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; @@ -3371,18 +3374,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( - "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(); @@ -3390,15 +3393,16 @@ lldb::ValueObjectSP ValueObject::CastToEnumType(CompilerType type) { 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() {} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
