maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixing an issue where the expression parser was not correctly freeze-drying bitfields - This patch ensures that (a) freeze-drying bitfields works correctly and (b) that we actually access bitfields through IR instead of the 'frame var en lieu of expr' shortcut, for added safety in corner cases that may arise 

llvm-svn: 155494
This commit is contained in:
Enrico Granata 2012-04-24 22:15:37 +00:00
parent e35cc3bff8
commit 9f1e204130
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lldb/include/lldb/Core/ValueObject.h
View File

@ -656,17 +656,23 @@ public:
}
virtual uint32_t
GetBitfieldBitSize()
GetBitfieldBitSize ()
{
return 0;
}
virtual uint32_t
GetBitfieldBitOffset()
GetBitfieldBitOffset ()
{
return 0;
}
bool
IsBitfield ()
{
return (GetBitfieldBitSize() != 0) || (GetBitfieldOffset() != 0);
}
virtual bool
IsArrayItemForPointer()
{

8
lldb/source/Core/ValueObject.cpp
View File

@ -3485,7 +3485,13 @@ ValueObject::CreateConstantValue (const ConstString &name)
data.SetByteOrder (m_data.GetByteOrder());
data.SetAddressByteSize(m_data.GetAddressByteSize());
m_error = m_value.GetValueAsData (&exe_ctx, ast, data, 0, GetModule().get());
if (IsBitfield())
{
Value v(Scalar(GetValueAsUnsigned(UINT64_MAX)));
m_error = v.GetValueAsData (&exe_ctx, ast, data, 0, GetModule().get());
}
else
m_error = m_value.GetValueAsData (&exe_ctx, ast, data, 0, GetModule().get());
valobj_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(),
ast,

3
lldb/source/Target/Target.cpp
View File

@ -1594,6 +1594,9 @@ Target::EvaluateExpression
expr_path_options,
var_sp,
error);
// if this expression results in a bitfield, we give up and let the IR handle it
if (result_valobj_sp && result_valobj_sp->IsBitfield())
result_valobj_sp.reset();
}
}
else if (m_process_sp)