svn commit: r293116 - in vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC: . AppleObjCRuntime

Ed Maste emaste at FreeBSD.org
Sun Jan 3 20:36:48 UTC 2016


Author: emaste
Date: Sun Jan  3 20:36:46 2016
New Revision: 293116
URL: https://svnweb.freebsd.org/changeset/base/293116

Log:
  Un-trim part of lldb trunk r256633
  
  This was stripped in r292932 but is used in the regular configuration
  of LLDB.
  
  Obtained from:	https://llvm.org/svn/llvm-project/lldb/trunk@256633

Added:
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.h   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.h   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp   (contents, props changed)
  vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h   (contents, props changed)

Added: vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp	Sun Jan  3 20:36:46 2016	(r293116)
@@ -0,0 +1,573 @@
+//===-- AppleObjCClassDescriptorV2.cpp -----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "AppleObjCClassDescriptorV2.h"
+
+#include "lldb/Core/Log.h"
+#include "lldb/Expression/FunctionCaller.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+bool
+ClassDescriptorV2::Read_objc_class (Process* process, std::unique_ptr<objc_class_t> &objc_class) const
+{
+    objc_class.reset(new objc_class_t);
+    
+    bool ret = objc_class->Read (process, m_objc_class_ptr);
+    
+    if (!ret)
+        objc_class.reset();
+    
+    return ret;
+}
+
+bool
+ClassDescriptorV2::objc_class_t::Read(Process *process, lldb::addr_t addr)
+{
+    size_t ptr_size = process->GetAddressByteSize();
+    
+    size_t objc_class_size = ptr_size   // uintptr_t isa;
+    + ptr_size   // Class superclass;
+    + ptr_size   // void *cache;
+    + ptr_size   // IMP *vtable;
+    + ptr_size;  // uintptr_t data_NEVER_USE;
+    
+    DataBufferHeap objc_class_buf (objc_class_size, '\0');
+    Error error;
+    
+    process->ReadMemory(addr, objc_class_buf.GetBytes(), objc_class_size, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    DataExtractor extractor(objc_class_buf.GetBytes(), objc_class_size, process->GetByteOrder(), process->GetAddressByteSize());
+    
+    lldb::offset_t cursor = 0;
+    
+    m_isa           = extractor.GetAddress_unchecked(&cursor);   // uintptr_t isa;
+    m_superclass    = extractor.GetAddress_unchecked(&cursor);   // Class superclass;
+    m_cache_ptr     = extractor.GetAddress_unchecked(&cursor);   // void *cache;
+    m_vtable_ptr    = extractor.GetAddress_unchecked(&cursor);   // IMP *vtable;
+    lldb::addr_t data_NEVER_USE = extractor.GetAddress_unchecked(&cursor);   // uintptr_t data_NEVER_USE;
+    
+    m_flags         = (uint8_t)(data_NEVER_USE & (lldb::addr_t)3);
+    m_data_ptr      = data_NEVER_USE & ~(lldb::addr_t)3;
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::class_rw_t::Read(Process *process, lldb::addr_t addr)
+{
+    size_t ptr_size = process->GetAddressByteSize();
+    
+    size_t size = sizeof(uint32_t)  // uint32_t flags;
+    + sizeof(uint32_t)  // uint32_t version;
+    + ptr_size          // const class_ro_t *ro;
+    + ptr_size          // union { method_list_t **method_lists; method_list_t *method_list; };
+    + ptr_size          // struct chained_property_list *properties;
+    + ptr_size          // const protocol_list_t **protocols;
+    + ptr_size          // Class firstSubclass;
+    + ptr_size;         // Class nextSiblingClass;
+    
+    DataBufferHeap buffer (size, '\0');
+    Error error;
+    
+    process->ReadMemory(addr, buffer.GetBytes(), size, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize());
+    
+    lldb::offset_t cursor = 0;
+    
+    m_flags             = extractor.GetU32_unchecked(&cursor);
+    m_version           = extractor.GetU32_unchecked(&cursor);
+    m_ro_ptr            = extractor.GetAddress_unchecked(&cursor);
+    m_method_list_ptr   = extractor.GetAddress_unchecked(&cursor);
+    m_properties_ptr    = extractor.GetAddress_unchecked(&cursor);
+    m_firstSubclass     = extractor.GetAddress_unchecked(&cursor);
+    m_nextSiblingClass  = extractor.GetAddress_unchecked(&cursor);
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::class_ro_t::Read(Process *process, lldb::addr_t addr)
+{
+    size_t ptr_size = process->GetAddressByteSize();
+    
+    size_t size = sizeof(uint32_t)             // uint32_t flags;
+    + sizeof(uint32_t)                         // uint32_t instanceStart;
+    + sizeof(uint32_t)                         // uint32_t instanceSize;
+    + (ptr_size == 8 ? sizeof(uint32_t) : 0)   // uint32_t reserved; // __LP64__ only
+    + ptr_size                                 // const uint8_t *ivarLayout;
+    + ptr_size                                 // const char *name;
+    + ptr_size                                 // const method_list_t *baseMethods;
+    + ptr_size                                 // const protocol_list_t *baseProtocols;
+    + ptr_size                                 // const ivar_list_t *ivars;
+    + ptr_size                                 // const uint8_t *weakIvarLayout;
+    + ptr_size;                                // const property_list_t *baseProperties;
+    
+    DataBufferHeap buffer (size, '\0');
+    Error error;
+    
+    process->ReadMemory(addr, buffer.GetBytes(), size, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize());
+    
+    lldb::offset_t cursor = 0;
+    
+    m_flags             = extractor.GetU32_unchecked(&cursor);
+    m_instanceStart     = extractor.GetU32_unchecked(&cursor);
+    m_instanceSize      = extractor.GetU32_unchecked(&cursor);
+    if (ptr_size == 8)
+        m_reserved      = extractor.GetU32_unchecked(&cursor);
+    else
+        m_reserved      = 0;
+    m_ivarLayout_ptr     = extractor.GetAddress_unchecked(&cursor);
+    m_name_ptr           = extractor.GetAddress_unchecked(&cursor);
+    m_baseMethods_ptr    = extractor.GetAddress_unchecked(&cursor);
+    m_baseProtocols_ptr  = extractor.GetAddress_unchecked(&cursor);
+    m_ivars_ptr          = extractor.GetAddress_unchecked(&cursor);
+    m_weakIvarLayout_ptr = extractor.GetAddress_unchecked(&cursor);
+    m_baseProperties_ptr = extractor.GetAddress_unchecked(&cursor);
+    
+    DataBufferHeap name_buf(1024, '\0');
+    
+    process->ReadCStringFromMemory(m_name_ptr, (char*)name_buf.GetBytes(), name_buf.GetByteSize(), error);
+    
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    m_name.assign((char*)name_buf.GetBytes());
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::Read_class_row (Process* process, const objc_class_t &objc_class, std::unique_ptr<class_ro_t> &class_ro, std::unique_ptr<class_rw_t> &class_rw) const
+{
+    class_ro.reset();
+    class_rw.reset();
+    
+    Error error;
+    uint32_t class_row_t_flags = process->ReadUnsignedIntegerFromMemory(objc_class.m_data_ptr, sizeof(uint32_t), 0, error);
+    if (!error.Success())
+        return false;
+    
+    if (class_row_t_flags & RW_REALIZED)
+    {
+        class_rw.reset(new class_rw_t);
+        
+        if (!class_rw->Read(process, objc_class.m_data_ptr))
+        {
+            class_rw.reset();
+            return false;
+        }
+        
+        class_ro.reset(new class_ro_t);
+        
+        if (!class_ro->Read(process, class_rw->m_ro_ptr))
+        {
+            class_rw.reset();
+            class_ro.reset();
+            return false;
+        }
+    }
+    else
+    {
+        class_ro.reset(new class_ro_t);
+        
+        if (!class_ro->Read(process, objc_class.m_data_ptr))
+        {
+            class_ro.reset();
+            return false;
+        }
+    }
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::method_list_t::Read(Process *process, lldb::addr_t addr)
+{
+    size_t size = sizeof(uint32_t)  // uint32_t entsize_NEVER_USE;
+    + sizeof(uint32_t); // uint32_t count;
+    
+    DataBufferHeap buffer (size, '\0');
+    Error error;
+    
+    process->ReadMemory(addr, buffer.GetBytes(), size, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize());
+    
+    lldb::offset_t cursor = 0;
+    
+    m_entsize   = extractor.GetU32_unchecked(&cursor) & ~(uint32_t)3;
+    m_count     = extractor.GetU32_unchecked(&cursor);
+    m_first_ptr  = addr + cursor;
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::method_t::Read(Process *process, lldb::addr_t addr)
+{
+    size_t size = GetSize(process);
+    
+    DataBufferHeap buffer (size, '\0');
+    Error error;
+    
+    process->ReadMemory(addr, buffer.GetBytes(), size, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize());
+    
+    lldb::offset_t cursor = 0;
+    
+    m_name_ptr   = extractor.GetAddress_unchecked(&cursor);
+    m_types_ptr  = extractor.GetAddress_unchecked(&cursor);
+    m_imp_ptr    = extractor.GetAddress_unchecked(&cursor);
+    
+    process->ReadCStringFromMemory(m_name_ptr, m_name, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    process->ReadCStringFromMemory(m_types_ptr, m_types, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::ivar_list_t::Read(Process *process, lldb::addr_t addr)
+{
+    size_t size = sizeof(uint32_t)  // uint32_t entsize;
+    + sizeof(uint32_t); // uint32_t count;
+    
+    DataBufferHeap buffer (size, '\0');
+    Error error;
+    
+    process->ReadMemory(addr, buffer.GetBytes(), size, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize());
+    
+    lldb::offset_t cursor = 0;
+    
+    m_entsize   = extractor.GetU32_unchecked(&cursor);
+    m_count     = extractor.GetU32_unchecked(&cursor);
+    m_first_ptr = addr + cursor;
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::ivar_t::Read(Process *process, lldb::addr_t addr)
+{
+    size_t size = GetSize(process);
+    
+    DataBufferHeap buffer (size, '\0');
+    Error error;
+    
+    process->ReadMemory(addr, buffer.GetBytes(), size, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize());
+    
+    lldb::offset_t cursor = 0;
+    
+    m_offset_ptr = extractor.GetAddress_unchecked(&cursor);
+    m_name_ptr   = extractor.GetAddress_unchecked(&cursor);
+    m_type_ptr   = extractor.GetAddress_unchecked(&cursor);
+    m_alignment  = extractor.GetU32_unchecked(&cursor);
+    m_size       = extractor.GetU32_unchecked(&cursor);
+    
+    process->ReadCStringFromMemory(m_name_ptr, m_name, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    process->ReadCStringFromMemory(m_type_ptr, m_type, error);
+    if (error.Fail())
+    {
+        return false;
+    }
+    
+    return true;
+}
+
+bool
+ClassDescriptorV2::Describe (std::function <void (ObjCLanguageRuntime::ObjCISA)> const &superclass_func,
+                             std::function <bool (const char *, const char *)> const &instance_method_func,
+                             std::function <bool (const char *, const char *)> const &class_method_func,
+                             std::function <bool (const char *, const char *, lldb::addr_t, uint64_t)> const &ivar_func) const
+{
+    lldb_private::Process *process = m_runtime.GetProcess();
+    
+    std::unique_ptr<objc_class_t> objc_class;
+    std::unique_ptr<class_ro_t> class_ro;
+    std::unique_ptr<class_rw_t> class_rw;
+    
+    if (!Read_objc_class(process, objc_class))
+        return 0;
+    if (!Read_class_row(process, *objc_class, class_ro, class_rw))
+        return 0;
+    
+    static ConstString NSObject_name("NSObject");
+    
+    if (m_name != NSObject_name && superclass_func)
+        superclass_func(objc_class->m_superclass);
+    
+    if (instance_method_func)
+    {
+        std::unique_ptr<method_list_t> base_method_list;
+        
+        base_method_list.reset(new method_list_t);
+        if (!base_method_list->Read(process, class_ro->m_baseMethods_ptr))
+            return false;
+        
+        if (base_method_list->m_entsize != method_t::GetSize(process))
+            return false;
+        
+        std::unique_ptr<method_t> method;
+        method.reset(new method_t);
+        
+        for (uint32_t i = 0, e = base_method_list->m_count; i < e; ++i)
+        {
+            method->Read(process, base_method_list->m_first_ptr + (i * base_method_list->m_entsize));
+            
+            if (instance_method_func(method->m_name.c_str(), method->m_types.c_str()))
+                break;
+        }
+    }
+    
+    if (class_method_func)
+    {
+        AppleObjCRuntime::ClassDescriptorSP metaclass(GetMetaclass());
+        
+        // We don't care about the metaclass's superclass, or its class methods.  Its instance methods are
+        // our class methods.
+        
+        if (metaclass) {
+            metaclass->Describe(std::function <void (ObjCLanguageRuntime::ObjCISA)> (nullptr),
+                                class_method_func,
+                                std::function <bool (const char *, const char *)> (nullptr),
+                                std::function <bool (const char *, const char *, lldb::addr_t, uint64_t)> (nullptr));
+        }
+    }
+    
+    if (ivar_func)
+    {
+        if (class_ro->m_ivars_ptr != 0)
+        {            
+            ivar_list_t ivar_list;
+            if (!ivar_list.Read(process, class_ro->m_ivars_ptr))
+                return false;
+            
+            if (ivar_list.m_entsize != ivar_t::GetSize(process))
+                return false;
+            
+            ivar_t ivar;
+            
+            for (uint32_t i = 0, e = ivar_list.m_count; i < e; ++i)
+            {
+                ivar.Read(process, ivar_list.m_first_ptr + (i * ivar_list.m_entsize));
+                
+                if (ivar_func(ivar.m_name.c_str(), ivar.m_type.c_str(), ivar.m_offset_ptr, ivar.m_size))
+                    break;
+            }
+        }
+    }
+    
+    return true;
+}
+
+ConstString
+ClassDescriptorV2::GetClassName ()
+{
+    if (!m_name)
+    {
+        lldb_private::Process *process = m_runtime.GetProcess();
+        
+        if (process)
+        {
+            std::unique_ptr<objc_class_t> objc_class;
+            std::unique_ptr<class_ro_t> class_ro;
+            std::unique_ptr<class_rw_t> class_rw;
+            
+            if (!Read_objc_class(process, objc_class))
+                return m_name;
+            if (!Read_class_row(process, *objc_class, class_ro, class_rw))
+                return m_name;
+            
+            m_name = ConstString(class_ro->m_name.c_str());
+        }
+    }
+    return m_name;
+}
+
+ObjCLanguageRuntime::ClassDescriptorSP
+ClassDescriptorV2::GetSuperclass ()
+{
+    lldb_private::Process *process = m_runtime.GetProcess();
+    
+    if (!process)
+        return ObjCLanguageRuntime::ClassDescriptorSP();
+    
+    std::unique_ptr<objc_class_t> objc_class;
+    
+    if (!Read_objc_class(process, objc_class))
+        return ObjCLanguageRuntime::ClassDescriptorSP();
+    
+    return m_runtime.ObjCLanguageRuntime::GetClassDescriptorFromISA(objc_class->m_superclass);
+}
+
+ObjCLanguageRuntime::ClassDescriptorSP
+ClassDescriptorV2::GetMetaclass () const
+{
+    lldb_private::Process *process = m_runtime.GetProcess();
+    
+    if (!process)
+        return ObjCLanguageRuntime::ClassDescriptorSP();
+    
+    std::unique_ptr<objc_class_t> objc_class;
+    
+    if (!Read_objc_class(process, objc_class))
+        return ObjCLanguageRuntime::ClassDescriptorSP();
+    
+    lldb::addr_t candidate_isa = m_runtime.GetPointerISA(objc_class->m_isa);
+    
+    return ObjCLanguageRuntime::ClassDescriptorSP(new ClassDescriptorV2(m_runtime, candidate_isa, nullptr));
+}
+
+uint64_t
+ClassDescriptorV2::GetInstanceSize ()
+{
+    lldb_private::Process *process = m_runtime.GetProcess();
+    
+    if (process)
+    {
+        std::unique_ptr<objc_class_t> objc_class;
+        std::unique_ptr<class_ro_t> class_ro;
+        std::unique_ptr<class_rw_t> class_rw;
+        
+        if (!Read_objc_class(process, objc_class))
+            return 0;
+        if (!Read_class_row(process, *objc_class, class_ro, class_rw))
+            return 0;
+        
+        return class_ro->m_instanceSize;
+    }
+    
+    return 0;
+}
+
+ClassDescriptorV2::iVarsStorage::iVarsStorage ():
+m_filled(false),
+m_ivars(),
+m_mutex(Mutex::eMutexTypeRecursive)
+{}
+
+size_t
+ClassDescriptorV2::iVarsStorage::size ()
+{
+    return m_ivars.size();
+}
+
+ClassDescriptorV2::iVarDescriptor&
+ClassDescriptorV2::iVarsStorage::operator[] (size_t idx)
+{
+    return m_ivars[idx];
+}
+
+void
+ClassDescriptorV2::iVarsStorage::fill (AppleObjCRuntimeV2& runtime, ClassDescriptorV2& descriptor)
+{
+    if (m_filled)
+        return;
+    Mutex::Locker lock(m_mutex);
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_TYPES | LIBLLDB_LOG_VERBOSE));
+    if (log)
+        log->Printf("[ClassDescriptorV2::iVarsStorage::fill] class_name = %s", descriptor.GetClassName().AsCString("<unknown"));
+    m_filled = true;
+    ObjCLanguageRuntime::EncodingToTypeSP encoding_to_type_sp(runtime.GetEncodingToType());
+    Process* process(runtime.GetProcess());
+    if (!encoding_to_type_sp)
+        return;
+    descriptor.Describe(nullptr,
+                        nullptr,
+                        nullptr,
+                        [this,process,encoding_to_type_sp,log](const char * name, const char * type, lldb::addr_t offset_ptr, uint64_t size) -> bool {
+                 const bool for_expression = false;
+                 const bool stop_loop = false;
+                 if (log)
+                     log->Printf("[ClassDescriptorV2::iVarsStorage::fill] name = %s, encoding = %s, offset_ptr = %" PRIx64 ", size = %" PRIu64,
+                                 name,type,offset_ptr,size);
+                 CompilerType ivar_type = encoding_to_type_sp->RealizeType(type, for_expression);
+                 if (ivar_type)
+                 {
+                     if (log)
+                         log->Printf("[ClassDescriptorV2::iVarsStorage::fill] name = %s, encoding = %s, offset_ptr = %" PRIx64 ", size = %" PRIu64 " , type_size = %" PRIu64,
+                                     name,type,offset_ptr,size,ivar_type.GetByteSize(nullptr));
+                     Scalar offset_scalar;
+                     Error error;
+                     const int offset_ptr_size = 4;
+                     const bool is_signed = false;
+                     size_t read = process->ReadScalarIntegerFromMemory(offset_ptr, offset_ptr_size, is_signed, offset_scalar, error);
+                     if (error.Success() && 4 == read)
+                     {
+                         if (log)
+                             log->Printf("[ClassDescriptorV2::iVarsStorage::fill] offset_ptr = %" PRIx64 " --> %" PRIu32,
+                                         offset_ptr, offset_scalar.SInt());
+                         m_ivars.push_back({ ConstString(name), ivar_type, size, offset_scalar.SInt() });
+                     }
+                     else if (log)
+                         log->Printf("[ClassDescriptorV2::iVarsStorage::fill] offset_ptr = %" PRIx64 " --> read fail, read = %zu",
+                                     offset_ptr, read);
+                 }
+                 return stop_loop;
+             });
+}
+
+void
+ClassDescriptorV2::GetIVarInformation ()
+{
+    m_ivars_storage.fill(m_runtime, *this);
+}

Added: vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h	Sun Jan  3 20:36:46 2016	(r293116)
@@ -0,0 +1,411 @@
+//===-- AppleObjCClassDescriptorV2.h ----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_AppleObjCClassDescriptorV2_h_
+#define liblldb_AppleObjCClassDescriptorV2_h_
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+#include "lldb/lldb-private.h"
+#include "lldb/Host/Mutex.h"
+#include "lldb/Target/ObjCLanguageRuntime.h"
+#include "AppleObjCRuntimeV2.h"
+
+namespace lldb_private {
+
+class ClassDescriptorV2 : public ObjCLanguageRuntime::ClassDescriptor
+{
+public:
+    friend class lldb_private::AppleObjCRuntimeV2;
+    
+    ~ClassDescriptorV2() override = default;
+
+    ConstString
+    GetClassName() override;
+    
+    ObjCLanguageRuntime::ClassDescriptorSP
+    GetSuperclass() override;
+    
+    ObjCLanguageRuntime::ClassDescriptorSP
+    GetMetaclass() const override;
+    
+    bool
+    IsValid() override
+    {
+        return true;    // any Objective-C v2 runtime class descriptor we vend is valid
+    }
+    
+    // a custom descriptor is used for tagged pointers
+    bool
+    GetTaggedPointerInfo(uint64_t* info_bits = nullptr,
+                         uint64_t* value_bits = nullptr,
+                         uint64_t* payload = nullptr) override
+    {
+        return false;
+    }
+    
+    uint64_t
+    GetInstanceSize() override;
+    
+    ObjCLanguageRuntime::ObjCISA
+    GetISA() override
+    {
+        return m_objc_class_ptr;
+    }
+    
+    bool
+    Describe(std::function <void (ObjCLanguageRuntime::ObjCISA)> const &superclass_func,
+             std::function <bool (const char *, const char *)> const &instance_method_func,
+             std::function <bool (const char *, const char *)> const &class_method_func,
+             std::function <bool (const char *, const char *,
+             lldb::addr_t, uint64_t)> const &ivar_func) const override;
+
+    size_t
+    GetNumIVars() override
+    {
+        GetIVarInformation();
+        return m_ivars_storage.size();
+    }
+    
+    iVarDescriptor
+    GetIVarAtIndex(size_t idx) override
+    {
+        if (idx >= GetNumIVars())
+            return iVarDescriptor();
+        return m_ivars_storage[idx];
+    }
+    
+protected:
+    void
+    GetIVarInformation ();
+    
+private:
+    static const uint32_t RW_REALIZED = (1 << 31);
+    
+    struct objc_class_t {
+        ObjCLanguageRuntime::ObjCISA    m_isa;              // The class's metaclass.
+        ObjCLanguageRuntime::ObjCISA    m_superclass;
+        lldb::addr_t                    m_cache_ptr;
+        lldb::addr_t                    m_vtable_ptr;
+        lldb::addr_t                    m_data_ptr;
+        uint8_t                         m_flags;
+        
+        objc_class_t () :
+        m_isa (0),
+        m_superclass (0),
+        m_cache_ptr (0),
+        m_vtable_ptr (0),
+        m_data_ptr (0),
+        m_flags (0)
+        {
+        }
+        
+        void
+        Clear()
+        {
+            m_isa = 0;
+            m_superclass = 0;
+            m_cache_ptr = 0;
+            m_vtable_ptr = 0;
+            m_data_ptr = 0;
+            m_flags = 0;
+        }
+        
+        bool
+        Read(Process *process, lldb::addr_t addr);
+    };
+    
+    struct class_ro_t {
+        uint32_t                        m_flags;
+        uint32_t                        m_instanceStart;
+        uint32_t                        m_instanceSize;
+        uint32_t                        m_reserved;
+        
+        lldb::addr_t                    m_ivarLayout_ptr;
+        lldb::addr_t                    m_name_ptr;
+        lldb::addr_t                    m_baseMethods_ptr;
+        lldb::addr_t                    m_baseProtocols_ptr;
+        lldb::addr_t                    m_ivars_ptr;
+        
+        lldb::addr_t                    m_weakIvarLayout_ptr;
+        lldb::addr_t                    m_baseProperties_ptr;
+        
+        std::string                     m_name;
+        
+        bool
+        Read(Process *process, lldb::addr_t addr);
+    };
+    
+    struct class_rw_t {
+        uint32_t                        m_flags;
+        uint32_t                        m_version;
+        
+        lldb::addr_t                    m_ro_ptr;
+        union {
+            lldb::addr_t                m_method_list_ptr;
+            lldb::addr_t                m_method_lists_ptr;
+        };
+        lldb::addr_t                    m_properties_ptr;
+        lldb::addr_t                    m_protocols_ptr;
+        
+        ObjCLanguageRuntime::ObjCISA    m_firstSubclass;
+        ObjCLanguageRuntime::ObjCISA    m_nextSiblingClass;
+        
+        bool
+        Read(Process *process, lldb::addr_t addr);
+    };
+    
+    struct method_list_t
+    {
+        uint32_t        m_entsize;
+        uint32_t        m_count;
+        lldb::addr_t    m_first_ptr;
+        
+        bool
+        Read(Process *process, lldb::addr_t addr);
+    };
+    
+    struct method_t
+    {
+        lldb::addr_t    m_name_ptr;
+        lldb::addr_t    m_types_ptr;
+        lldb::addr_t    m_imp_ptr;
+        
+        std::string     m_name;
+        std::string     m_types;
+        
+        static size_t GetSize(Process *process)
+        {
+            size_t ptr_size = process->GetAddressByteSize();
+            
+            return ptr_size     // SEL name;
+            + ptr_size   // const char *types;
+            + ptr_size;  // IMP imp;
+        }
+        
+        bool
+        Read(Process *process, lldb::addr_t addr);
+    };
+    
+    struct ivar_list_t
+    {
+        uint32_t        m_entsize;
+        uint32_t        m_count;
+        lldb::addr_t    m_first_ptr;
+        
+        bool Read(Process *process, lldb::addr_t addr);
+    };
+    
+    struct ivar_t
+    {
+        lldb::addr_t    m_offset_ptr;
+        lldb::addr_t    m_name_ptr;
+        lldb::addr_t    m_type_ptr;
+        uint32_t        m_alignment;
+        uint32_t        m_size;
+        
+        std::string     m_name;
+        std::string     m_type;
+        
+        static size_t GetSize(Process *process)
+        {
+            size_t ptr_size = process->GetAddressByteSize();
+            
+            return ptr_size             // uintptr_t *offset;
+            + ptr_size             // const char *name;
+            + ptr_size             // const char *type;
+            + sizeof(uint32_t)     // uint32_t alignment;
+            + sizeof(uint32_t);    // uint32_t size;
+        }
+        
+        bool
+        Read(Process *process, lldb::addr_t addr);
+    };
+    
+    class iVarsStorage
+    {
+    public:
+        iVarsStorage ();
+        
+        size_t
+        size ();
+        
+        iVarDescriptor&
+        operator[] (size_t idx);
+        
+        void
+        fill (AppleObjCRuntimeV2& runtime, ClassDescriptorV2& descriptor);
+        
+    private:
+        bool m_filled;
+        std::vector<iVarDescriptor> m_ivars;
+        Mutex m_mutex;
+    };
+    
+    // The constructor should only be invoked by the runtime as it builds its caches
+    // or populates them.  A ClassDescriptorV2 should only ever exist in a cache.
+    ClassDescriptorV2(AppleObjCRuntimeV2 &runtime, ObjCLanguageRuntime::ObjCISA isa, const char *name) :
+        m_runtime (runtime),
+        m_objc_class_ptr (isa),
+        m_name (name),
+        m_ivars_storage()
+    {
+    }
+    
+    bool
+    Read_objc_class (Process* process, std::unique_ptr<objc_class_t> &objc_class) const;
+    
+    bool
+    Read_class_row (Process* process, const objc_class_t &objc_class, std::unique_ptr<class_ro_t> &class_ro, std::unique_ptr<class_rw_t> &class_rw) const;
+    
+    AppleObjCRuntimeV2 &m_runtime;          // The runtime, so we can read information lazily.
+    lldb::addr_t        m_objc_class_ptr;   // The address of the objc_class_t.  (I.e., objects of this class type have this as their ISA)
+    ConstString         m_name;             // May be NULL
+    iVarsStorage        m_ivars_storage;
+};
+
+// tagged pointer descriptor
+class ClassDescriptorV2Tagged : public ObjCLanguageRuntime::ClassDescriptor
+{
+public:
+    ClassDescriptorV2Tagged (ConstString class_name,
+                             uint64_t payload)
+    {
+        m_name = class_name;
+        if (!m_name)
+        {
+            m_valid = false;
+            return;
+        }
+        m_valid = true;
+        m_payload = payload;
+        m_info_bits = (m_payload & 0xF0ULL) >> 4;
+        m_value_bits = (m_payload & ~0x0000000000000000FFULL) >> 8;
+    }
+    
+    ClassDescriptorV2Tagged (ObjCLanguageRuntime::ClassDescriptorSP actual_class_sp,
+                             uint64_t payload)
+    {
+        if (!actual_class_sp)
+        {
+            m_valid = false;
+            return;
+        }
+        m_name = actual_class_sp->GetClassName();
+        if (!m_name)
+        {
+            m_valid = false;
+            return;
+        }
+        m_valid = true;
+        m_payload = payload;
+        m_info_bits = (m_payload & 0x0FULL);
+        m_value_bits = (m_payload & ~0x0FULL) >> 4;
+    }
+    
+    ~ClassDescriptorV2Tagged() override = default;
+
+    ConstString
+    GetClassName() override
+    {
+        return m_name;
+    }
+    
+    ObjCLanguageRuntime::ClassDescriptorSP
+    GetSuperclass() override
+    {
+        // tagged pointers can represent a class that has a superclass, but since that information is not
+        // stored in the object itself, we would have to query the runtime to discover the hierarchy
+        // for the time being, we skip this step in the interest of static discovery
+        return ObjCLanguageRuntime::ClassDescriptorSP();
+    }
+    
+    ObjCLanguageRuntime::ClassDescriptorSP
+    GetMetaclass() const override
+    {
+        return ObjCLanguageRuntime::ClassDescriptorSP();
+    }
+    
+    bool
+    IsValid() override
+    {
+        return m_valid;
+    }
+    
+    bool
+    IsKVO() override
+    {
+        return false; // tagged pointers are not KVO'ed
+    }
+    
+    bool
+    IsCFType() override
+    {
+        return false; // tagged pointers are not CF objects
+    }
+    
+    bool
+    GetTaggedPointerInfo(uint64_t* info_bits = nullptr,
+                         uint64_t* value_bits = nullptr,
+                         uint64_t* payload = nullptr) override
+    {
+        if (info_bits)
+            *info_bits = GetInfoBits();
+        if (value_bits)
+            *value_bits = GetValueBits();
+        if (payload)
+            *payload = GetPayload();
+        return true;
+    }
+    
+    uint64_t
+    GetInstanceSize() override
+    {
+        return (IsValid() ? m_pointer_size : 0);
+    }
+    
+    ObjCLanguageRuntime::ObjCISA
+    GetISA() override
+    {
+        return 0; // tagged pointers have no ISA
+    }
+    
+    // these calls are not part of any formal tagged pointers specification
+    virtual uint64_t
+    GetValueBits ()
+    {
+        return (IsValid() ? m_value_bits : 0);
+    }
+    
+    virtual uint64_t
+    GetInfoBits ()
+    {
+        return (IsValid() ? m_info_bits : 0);
+    }
+    
+    virtual uint64_t
+    GetPayload ()
+    {
+        return (IsValid() ? m_payload : 0);
+    }
+
+private:
+    ConstString m_name;
+    uint8_t m_pointer_size;
+    bool m_valid;
+    uint64_t m_info_bits;
+    uint64_t m_value_bits;
+    uint64_t m_payload;
+};
+    
+} // namespace lldb_private
+
+#endif // liblldb_AppleObjCClassDescriptorV2_h_

Added: vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/lldb/dist/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp	Sun Jan  3 20:36:46 2016	(r293116)
@@ -0,0 +1,665 @@
+//===-- AppleObjCDeclVendor.cpp ---------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-all mailing list