From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 18:02:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A9DE981; Wed, 26 Nov 2014 18:02:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6648EC1D; Wed, 26 Nov 2014 18:02:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQI2N3h082170; Wed, 26 Nov 2014 18:02:23 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQI2NQq082169; Wed, 26 Nov 2014 18:02:23 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261802.sAQI2NQq082169@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 18:02:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275134 - projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 18:02:23 -0000 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 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 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 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 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 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 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(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 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 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 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