svn commit: r275134 - projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol
Ed Maste
emaste at FreeBSD.org
Wed Nov 26 18:02:23 UTC 2014
Author: emaste
Date: Wed Nov 26 18:02:22 2014
New Revision: 275134
URL: https://svnweb.freebsd.org/changeset/base/275134
Log:
Revert LLDB changes for Clang/LLVM 3.5 API compatibility
This reverts the following upstream revisions:
SVN git
214335 59a1f270
214340 42f16b1e
Modified:
projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
==============================================================================
--- projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 17:44:49 2014 (r275133)
+++ projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 18:02:22 2014 (r275134)
@@ -3294,9 +3294,9 @@ ClangASTType::GetChildClangTypeAtIndex (
child_name.assign(superclass_interface_decl->getNameAsString().c_str());
- clang::TypeInfo ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
+ std::pair<uint64_t, unsigned> ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
- child_byte_size = ivar_type_info.Width / 8;
+ child_byte_size = ivar_type_info.first / 8;
child_byte_offset = 0;
child_is_base_class = true;
@@ -3326,9 +3326,9 @@ ClangASTType::GetChildClangTypeAtIndex (
child_name.assign(ivar_decl->getNameAsString().c_str());
- clang::TypeInfo ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
+ std::pair<uint64_t, unsigned> ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
- child_byte_size = ivar_type_info.Width / 8;
+ child_byte_size = ivar_type_info.first / 8;
// Figure out the field offset within the current struct/union/class type
// For ObjC objects, we can't trust the bit offset we get from the Clang AST, since
@@ -5825,7 +5825,7 @@ ClangASTType::DumpValue (ExecutionContex
// Indent and print the base class type name
s->Printf("\n%*s%s ", depth + DEPTH_INCREMENT, "", base_class_type_name.c_str());
- clang::TypeInfo base_class_type_info = m_ast->getTypeInfo(base_class_qual_type);
+ std::pair<uint64_t, unsigned> base_class_type_info = m_ast->getTypeInfo(base_class_qual_type);
// Dump the value of the member
ClangASTType base_clang_type(m_ast, base_class_qual_type);
@@ -5834,7 +5834,7 @@ ClangASTType::DumpValue (ExecutionContex
base_clang_type.GetFormat(), // The format with which to display the member
data, // Data buffer containing all bytes for this type
data_byte_offset + field_byte_offset,// Offset into "data" where to grab value from
- base_class_type_info.Width / 8, // Size of this type in bytes
+ base_class_type_info.first / 8, // Size of this type in bytes
0, // Bitfield bit size
0, // Bitfield bit offset
show_types, // Boolean indicating if we should show the variable types
@@ -5864,7 +5864,7 @@ ClangASTType::DumpValue (ExecutionContex
// Print the member type if requested
// Figure out the type byte size (field_type_info.first) and
// alignment (field_type_info.second) from the AST context.
- clang::TypeInfo field_type_info = m_ast->getTypeInfo(field_type);
+ std::pair<uint64_t, unsigned> field_type_info = m_ast->getTypeInfo(field_type);
assert(field_idx < record_layout.getFieldCount());
// Figure out the field offset within the current struct/union/class type
field_bit_offset = record_layout.getFieldOffset (field_idx);
@@ -5893,7 +5893,7 @@ ClangASTType::DumpValue (ExecutionContex
field_clang_type.GetFormat(), // The format with which to display the member
data, // Data buffer containing all bytes for this type
data_byte_offset + field_byte_offset,// Offset into "data" where to grab value from
- field_type_info.Width / 8, // Size of this type in bytes
+ field_type_info.first / 8, // Size of this type in bytes
field_bitfield_bit_size, // Bitfield bit size
field_bitfield_bit_offset, // Bitfield bit offset
show_types, // Boolean indicating if we should show the variable types
@@ -5943,11 +5943,11 @@ ClangASTType::DumpValue (ExecutionContex
const uint64_t element_count = array->getSize().getLimitedValue();
- clang::TypeInfo field_type_info = m_ast->getTypeInfo(element_qual_type);
+ std::pair<uint64_t, unsigned> field_type_info = m_ast->getTypeInfo(element_qual_type);
uint32_t element_idx = 0;
uint32_t element_offset = 0;
- uint64_t element_byte_size = field_type_info.Width / 8;
+ uint64_t element_byte_size = field_type_info.first / 8;
uint32_t element_stride = element_byte_size;
if (is_array_of_characters)
@@ -6006,8 +6006,8 @@ ClangASTType::DumpValue (ExecutionContex
ClangASTType typedef_clang_type (m_ast, typedef_qual_type);
lldb::Format typedef_format = typedef_clang_type.GetFormat();
- clang::TypeInfo typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
- uint64_t typedef_byte_size = typedef_type_info.Width / 8;
+ std::pair<uint64_t, unsigned> typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
+ uint64_t typedef_byte_size = typedef_type_info.first / 8;
return typedef_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
@@ -6029,8 +6029,8 @@ ClangASTType::DumpValue (ExecutionContex
clang::QualType elaborated_qual_type = llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType();
ClangASTType elaborated_clang_type (m_ast, elaborated_qual_type);
lldb::Format elaborated_format = elaborated_clang_type.GetFormat();
- clang::TypeInfo elaborated_type_info = m_ast->getTypeInfo(elaborated_qual_type);
- uint64_t elaborated_byte_size = elaborated_type_info.Width / 8;
+ std::pair<uint64_t, unsigned> elaborated_type_info = m_ast->getTypeInfo(elaborated_qual_type);
+ uint64_t elaborated_byte_size = elaborated_type_info.first / 8;
return elaborated_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
@@ -6053,8 +6053,8 @@ ClangASTType::DumpValue (ExecutionContex
ClangASTType desugar_clang_type (m_ast, desugar_qual_type);
lldb::Format desugar_format = desugar_clang_type.GetFormat();
- clang::TypeInfo desugar_type_info = m_ast->getTypeInfo(desugar_qual_type);
- uint64_t desugar_byte_size = desugar_type_info.Width / 8;
+ std::pair<uint64_t, unsigned> desugar_type_info = m_ast->getTypeInfo(desugar_qual_type);
+ uint64_t desugar_byte_size = desugar_type_info.first / 8;
return desugar_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
@@ -6121,8 +6121,8 @@ ClangASTType::DumpTypeValue (Stream *s,
ClangASTType typedef_clang_type (m_ast, typedef_qual_type);
if (format == eFormatDefault)
format = typedef_clang_type.GetFormat();
- clang::TypeInfo typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
- uint64_t typedef_byte_size = typedef_type_info.Width / 8;
+ std::pair<uint64_t, unsigned> typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
+ uint64_t typedef_byte_size = typedef_type_info.first / 8;
return typedef_clang_type.DumpTypeValue (s,
format, // The format with which to display the element
More information about the svn-src-projects
mailing list