Updates the DW_AT_data_member_location handlers for the LLDB DWARF plugin
to handle the case of an integer constant (DWARF 3 and later).
- Fixes tests that assert in RecordLayoutBuilder::updateExternalFieldOffset
because LLDB was providing an external AST source with missing member offsets.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187423 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index d80236c..aa79d29 100644
--- a/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -1780,6 +1780,13 @@
member_byte_offset = memberOffset.ResolveValue(NULL).UInt();
}
}
+ else
+ {
+ // With DWARF 3 and later, if the value is an integer constant,
+ // this form value is the offset in bytes from the beginning
+ // of the containing entity.
+ member_byte_offset = form_value.Unsigned();
+ }
break;
case DW_AT_accessibility: accessibility = DW_ACCESS_to_AccessType (form_value.Unsigned()); break;
@@ -2164,16 +2171,28 @@
member_byte_offset = memberOffset.ResolveValue(NULL).UInt();
}
}
+ else
+ {
+ // With DWARF 3 and later, if the value is an integer constant,
+ // this form value is the offset in bytes from the beginning
+ // of the containing entity.
+ member_byte_offset = form_value.Unsigned();
+ }
break;
case DW_AT_accessibility:
accessibility = DW_ACCESS_to_AccessType(form_value.Unsigned());
break;
- case DW_AT_virtuality: is_virtual = form_value.Boolean(); break;
- default:
+ case DW_AT_virtuality:
+ is_virtual = form_value.Boolean();
+ break;
+
case DW_AT_sibling:
break;
+
+ default:
+ break;
}
}
}
@@ -2620,7 +2639,7 @@
assert(false && "not a forward clang type decl!");
break;
}
- return NULL;
+ return false;
}
Type*
