[Lldb-commits] [lldb] r248175 - Rename GetChildClangTypeAtIndex to GetChildCompilerTypeAtIndex

Bruce Mitchener via lldb-commits lldb-commits at lists.llvm.org
Mon Sep 21 09:48:49 PDT 2015


Author: brucem
Date: Mon Sep 21 11:48:48 2015
New Revision: 248175

URL: http://llvm.org/viewvc/llvm-project?rev=248175&view=rev
Log:
Rename GetChildClangTypeAtIndex to GetChildCompilerTypeAtIndex

Reviewers: clayborg

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D13020

Modified:
    lldb/trunk/include/lldb/Symbol/ClangASTContext.h
    lldb/trunk/include/lldb/Symbol/CompilerType.h
    lldb/trunk/include/lldb/Symbol/GoASTContext.h
    lldb/trunk/include/lldb/Symbol/TypeSystem.h
    lldb/trunk/source/Core/ValueObject.cpp
    lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp
    lldb/trunk/source/Symbol/CompilerType.cpp
    lldb/trunk/source/Symbol/GoASTContext.cpp

Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Mon Sep 21 11:48:48 2015
@@ -863,20 +863,20 @@ public:
     GetNumPointeeChildren (clang::QualType type);
     
     CompilerType
-    GetChildClangTypeAtIndex (void *type,
-                              ExecutionContext *exe_ctx,
-                              size_t idx,
-                              bool transparent_pointers,
-                              bool omit_empty_base_classes,
-                              bool ignore_array_bounds,
-                              std::string& child_name,
-                              uint32_t &child_byte_size,
-                              int32_t &child_byte_offset,
-                              uint32_t &child_bitfield_bit_size,
-                              uint32_t &child_bitfield_bit_offset,
-                              bool &child_is_base_class,
-                              bool &child_is_deref_of_parent,
-                              ValueObject *valobj) override;
+    GetChildCompilerTypeAtIndex (void *type,
+                                 ExecutionContext *exe_ctx,
+                                 size_t idx,
+                                 bool transparent_pointers,
+                                 bool omit_empty_base_classes,
+                                 bool ignore_array_bounds,
+                                 std::string& child_name,
+                                 uint32_t &child_byte_size,
+                                 int32_t &child_byte_offset,
+                                 uint32_t &child_bitfield_bit_size,
+                                 uint32_t &child_bitfield_bit_offset,
+                                 bool &child_is_base_class,
+                                 bool &child_is_deref_of_parent,
+                                 ValueObject *valobj) override;
     
     // Lookup a child given a name. This function will match base class names
     // and member member names in "clang_type" only, not descendants.

Modified: lldb/trunk/include/lldb/Symbol/CompilerType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/CompilerType.h?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/CompilerType.h (original)
+++ lldb/trunk/include/lldb/Symbol/CompilerType.h Mon Sep 21 11:48:48 2015
@@ -419,19 +419,19 @@ public:
                              bool *is_bitfield_ptr = NULL) const;
     
     CompilerType
-    GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
-                              size_t idx,
-                              bool transparent_pointers,
-                              bool omit_empty_base_classes,
-                              bool ignore_array_bounds,
-                              std::string& child_name,
-                              uint32_t &child_byte_size,
-                              int32_t &child_byte_offset,
-                              uint32_t &child_bitfield_bit_size,
-                              uint32_t &child_bitfield_bit_offset,
-                              bool &child_is_base_class,
-                              bool &child_is_deref_of_parent,
-                              ValueObject *valobj) const;
+    GetChildCompilerTypeAtIndex (ExecutionContext *exe_ctx,
+                                 size_t idx,
+                                 bool transparent_pointers,
+                                 bool omit_empty_base_classes,
+                                 bool ignore_array_bounds,
+                                 std::string& child_name,
+                                 uint32_t &child_byte_size,
+                                 int32_t &child_byte_offset,
+                                 uint32_t &child_bitfield_bit_size,
+                                 uint32_t &child_bitfield_bit_offset,
+                                 bool &child_is_base_class,
+                                 bool &child_is_deref_of_parent,
+                                 ValueObject *valobj) const;
     
     // Lookup a child given a name. This function will match base class names
     // and member member names in "clang_type" only, not descendants.

Modified: lldb/trunk/include/lldb/Symbol/GoASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/GoASTContext.h?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/GoASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/GoASTContext.h Mon Sep 21 11:48:48 2015
@@ -274,13 +274,13 @@ class GoASTContext : public TypeSystem
         return CompilerType();
     }
 
-    virtual CompilerType GetChildClangTypeAtIndex(void *type, ExecutionContext *exe_ctx, size_t idx,
-                                                  bool transparent_pointers, bool omit_empty_base_classes,
-                                                  bool ignore_array_bounds, std::string &child_name,
-                                                  uint32_t &child_byte_size, int32_t &child_byte_offset,
-                                                  uint32_t &child_bitfield_bit_size,
-                                                  uint32_t &child_bitfield_bit_offset, bool &child_is_base_class,
-                                                  bool &child_is_deref_of_parent, ValueObject *valobj) override;
+    virtual CompilerType GetChildCompilerTypeAtIndex(void *type, ExecutionContext *exe_ctx, size_t idx,
+                                                     bool transparent_pointers, bool omit_empty_base_classes,
+                                                     bool ignore_array_bounds, std::string &child_name,
+                                                     uint32_t &child_byte_size, int32_t &child_byte_offset,
+                                                     uint32_t &child_bitfield_bit_size,
+                                                     uint32_t &child_bitfield_bit_offset, bool &child_is_base_class,
+                                                     bool &child_is_deref_of_parent, ValueObject *valobj) override;
 
     // Lookup a child given a name. This function will match base class names
     // and member member names in "clang_type" only, not descendants.

Modified: lldb/trunk/include/lldb/Symbol/TypeSystem.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/TypeSystem.h?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/TypeSystem.h (original)
+++ lldb/trunk/include/lldb/Symbol/TypeSystem.h Mon Sep 21 11:48:48 2015
@@ -324,20 +324,20 @@ public:
                                 uint32_t *bit_offset_ptr) = 0;
 
     virtual CompilerType
-    GetChildClangTypeAtIndex (void *type,
-                              ExecutionContext *exe_ctx,
-                              size_t idx,
-                              bool transparent_pointers,
-                              bool omit_empty_base_classes,
-                              bool ignore_array_bounds,
-                              std::string& child_name,
-                              uint32_t &child_byte_size,
-                              int32_t &child_byte_offset,
-                              uint32_t &child_bitfield_bit_size,
-                              uint32_t &child_bitfield_bit_offset,
-                              bool &child_is_base_class,
-                              bool &child_is_deref_of_parent,
-                              ValueObject *valobj) = 0;
+    GetChildCompilerTypeAtIndex (void *type,
+                                 ExecutionContext *exe_ctx,
+                                 size_t idx,
+                                 bool transparent_pointers,
+                                 bool omit_empty_base_classes,
+                                 bool ignore_array_bounds,
+                                 std::string& child_name,
+                                 uint32_t &child_byte_size,
+                                 int32_t &child_byte_offset,
+                                 uint32_t &child_bitfield_bit_size,
+                                 uint32_t &child_bitfield_bit_offset,
+                                 bool &child_is_base_class,
+                                 bool &child_is_deref_of_parent,
+                                 ValueObject *valobj) = 0;
     
     // Lookup a child given a name. This function will match base class names
     // and member member names in "clang_type" only, not descendants.

Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Mon Sep 21 11:48:48 2015
@@ -829,24 +829,24 @@ ValueObject::CreateChildAtIndex (size_t
     bool child_is_deref_of_parent = false;
 
     const bool transparent_pointers = synthetic_array_member == false;
-    CompilerType child_clang_type;
+    CompilerType child_compiler_type;
     
     ExecutionContext exe_ctx (GetExecutionContextRef());
     
-    child_clang_type = GetCompilerType().GetChildClangTypeAtIndex (&exe_ctx,
-                                                                idx,
-                                                                transparent_pointers,
-                                                                omit_empty_base_classes,
-                                                                ignore_array_bounds,
-                                                                child_name_str,
-                                                                child_byte_size,
-                                                                child_byte_offset,
-                                                                child_bitfield_bit_size,
-                                                                child_bitfield_bit_offset,
-                                                                child_is_base_class,
-                                                                child_is_deref_of_parent,
-                                                                this);
-    if (child_clang_type)
+    child_compiler_type = GetCompilerType().GetChildCompilerTypeAtIndex (&exe_ctx,
+                                                                      idx,
+                                                                      transparent_pointers,
+                                                                      omit_empty_base_classes,
+                                                                      ignore_array_bounds,
+                                                                      child_name_str,
+                                                                      child_byte_size,
+                                                                      child_byte_offset,
+                                                                      child_bitfield_bit_size,
+                                                                      child_bitfield_bit_offset,
+                                                                      child_is_base_class,
+                                                                      child_is_deref_of_parent,
+                                                                      this);
+    if (child_compiler_type)
     {
         if (synthetic_index)
             child_byte_offset += child_byte_size * synthetic_index;
@@ -856,7 +856,7 @@ ValueObject::CreateChildAtIndex (size_t
             child_name.SetCString (child_name_str.c_str());
 
         valobj = new ValueObjectChild (*this,
-                                       child_clang_type,
+                                       child_compiler_type,
                                        child_name,
                                        child_byte_size,
                                        child_byte_offset,
@@ -3725,32 +3725,32 @@ ValueObject::Dereference (Error &error)
         bool child_is_base_class = false;
         bool child_is_deref_of_parent = false;
         const bool transparent_pointers = false;
-        CompilerType clang_type = GetCompilerType();
-        CompilerType child_clang_type;
+        CompilerType compiler_type = GetCompilerType();
+        CompilerType child_compiler_type;
 
         ExecutionContext exe_ctx (GetExecutionContextRef());
 
-        child_clang_type = clang_type.GetChildClangTypeAtIndex (&exe_ctx,
-                                                                0,
-                                                                transparent_pointers,
-                                                                omit_empty_base_classes,
-                                                                ignore_array_bounds,
-                                                                child_name_str,
-                                                                child_byte_size,
-                                                                child_byte_offset,
-                                                                child_bitfield_bit_size,
-                                                                child_bitfield_bit_offset,
-                                                                child_is_base_class,
-                                                                child_is_deref_of_parent,
-                                                                this);
-        if (child_clang_type && child_byte_size)
+        child_compiler_type = compiler_type.GetChildCompilerTypeAtIndex (&exe_ctx,
+                                                                         0,
+                                                                         transparent_pointers,
+                                                                         omit_empty_base_classes,
+                                                                         ignore_array_bounds,
+                                                                         child_name_str,
+                                                                         child_byte_size,
+                                                                         child_byte_offset,
+                                                                         child_bitfield_bit_size,
+                                                                         child_bitfield_bit_offset,
+                                                                         child_is_base_class,
+                                                                         child_is_deref_of_parent,
+                                                                         this);
+        if (child_compiler_type && child_byte_size)
         {
             ConstString child_name;
             if (!child_name_str.empty())
                 child_name.SetCString (child_name_str.c_str());
 
             m_deref_valobj = new ValueObjectChild (*this,
-                                                   child_clang_type,
+                                                   child_compiler_type,
                                                    child_name,
                                                    child_byte_size,
                                                    child_byte_offset,

Modified: lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp Mon Sep 21 11:48:48 2015
@@ -72,24 +72,24 @@ ValueObjectConstResultImpl::CreateChildA
     
     const bool transparent_pointers = synthetic_array_member == false;
     CompilerType clang_type = m_impl_backend->GetCompilerType();
-    CompilerType child_clang_type;
+    CompilerType child_compiler_type;
     
     ExecutionContext exe_ctx (m_impl_backend->GetExecutionContextRef());
     
-    child_clang_type = clang_type.GetChildClangTypeAtIndex (&exe_ctx,
-                                                            idx,
-                                                            transparent_pointers,
-                                                            omit_empty_base_classes,
-                                                            ignore_array_bounds,
-                                                            child_name_str,
-                                                            child_byte_size,
-                                                            child_byte_offset,
-                                                            child_bitfield_bit_size,
-                                                            child_bitfield_bit_offset,
-                                                            child_is_base_class,
-                                                            child_is_deref_of_parent,
-                                                            m_impl_backend);
-    if (child_clang_type && child_byte_size)
+    child_compiler_type = clang_type.GetChildCompilerTypeAtIndex (&exe_ctx,
+                                                                  idx,
+                                                                  transparent_pointers,
+                                                                  omit_empty_base_classes,
+                                                                  ignore_array_bounds,
+                                                                  child_name_str,
+                                                                  child_byte_size,
+                                                                  child_byte_offset,
+                                                                  child_bitfield_bit_size,
+                                                                  child_bitfield_bit_offset,
+                                                                  child_is_base_class,
+                                                                  child_is_deref_of_parent,
+                                                                  m_impl_backend);
+    if (child_compiler_type && child_byte_size)
     {
         if (synthetic_index)
             child_byte_offset += child_byte_size * synthetic_index;
@@ -99,7 +99,7 @@ ValueObjectConstResultImpl::CreateChildA
             child_name.SetCString (child_name_str.c_str());
 
         valobj = new ValueObjectConstResultChild (*m_impl_backend,
-                                                  child_clang_type,
+                                                  child_compiler_type,
                                                   child_name,
                                                   child_byte_size,
                                                   child_byte_offset,

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Mon Sep 21 11:48:48 2015
@@ -5567,20 +5567,20 @@ ClangASTContext::GetNumPointeeChildren (
 
 
 CompilerType
-ClangASTContext::GetChildClangTypeAtIndex (void* type,
-                                           ExecutionContext *exe_ctx,
-                                           size_t idx,
-                                           bool transparent_pointers,
-                                           bool omit_empty_base_classes,
-                                           bool ignore_array_bounds,
-                                           std::string& child_name,
-                                           uint32_t &child_byte_size,
-                                           int32_t &child_byte_offset,
-                                           uint32_t &child_bitfield_bit_size,
-                                           uint32_t &child_bitfield_bit_offset,
-                                           bool &child_is_base_class,
-                                           bool &child_is_deref_of_parent,
-                                           ValueObject *valobj)
+ClangASTContext::GetChildCompilerTypeAtIndex (void* type,
+                                              ExecutionContext *exe_ctx,
+                                              size_t idx,
+                                              bool transparent_pointers,
+                                              bool omit_empty_base_classes,
+                                              bool ignore_array_bounds,
+                                              std::string& child_name,
+                                              uint32_t &child_byte_size,
+                                              int32_t &child_byte_offset,
+                                              uint32_t &child_bitfield_bit_size,
+                                              uint32_t &child_bitfield_bit_offset,
+                                              bool &child_is_base_class,
+                                              bool &child_is_deref_of_parent,
+                                              ValueObject *valobj)
 {
     if (!type)
         return CompilerType();
@@ -5888,19 +5888,19 @@ ClangASTContext::GetChildClangTypeAtInde
                 {
                     child_is_deref_of_parent = false;
                     bool tmp_child_is_deref_of_parent = false;
-                    return pointee_clang_type.GetChildClangTypeAtIndex (exe_ctx,
-                                                                        idx,
-                                                                        transparent_pointers,
-                                                                        omit_empty_base_classes,
-                                                                        ignore_array_bounds,
-                                                                        child_name,
-                                                                        child_byte_size,
-                                                                        child_byte_offset,
-                                                                        child_bitfield_bit_size,
-                                                                        child_bitfield_bit_offset,
-                                                                        child_is_base_class,
-                                                                        tmp_child_is_deref_of_parent,
-                                                                        valobj);
+                    return pointee_clang_type.GetChildCompilerTypeAtIndex (exe_ctx,
+                                                                           idx,
+                                                                           transparent_pointers,
+                                                                           omit_empty_base_classes,
+                                                                           ignore_array_bounds,
+                                                                           child_name,
+                                                                           child_byte_size,
+                                                                           child_byte_offset,
+                                                                           child_bitfield_bit_size,
+                                                                           child_bitfield_bit_offset,
+                                                                           child_is_base_class,
+                                                                           tmp_child_is_deref_of_parent,
+                                                                           valobj);
                 }
                 else
                 {
@@ -5979,19 +5979,19 @@ ClangASTContext::GetChildClangTypeAtInde
                 {
                     child_is_deref_of_parent = false;
                     bool tmp_child_is_deref_of_parent = false;
-                    return pointee_clang_type.GetChildClangTypeAtIndex (exe_ctx,
-                                                                        idx,
-                                                                        transparent_pointers,
-                                                                        omit_empty_base_classes,
-                                                                        ignore_array_bounds,
-                                                                        child_name,
-                                                                        child_byte_size,
-                                                                        child_byte_offset,
-                                                                        child_bitfield_bit_size,
-                                                                        child_bitfield_bit_offset,
-                                                                        child_is_base_class,
-                                                                        tmp_child_is_deref_of_parent,
-                                                                        valobj);
+                    return pointee_clang_type.GetChildCompilerTypeAtIndex (exe_ctx,
+                                                                           idx,
+                                                                           transparent_pointers,
+                                                                           omit_empty_base_classes,
+                                                                           ignore_array_bounds,
+                                                                           child_name,
+                                                                           child_byte_size,
+                                                                           child_byte_offset,
+                                                                           child_bitfield_bit_size,
+                                                                           child_bitfield_bit_offset,
+                                                                           child_is_base_class,
+                                                                           tmp_child_is_deref_of_parent,
+                                                                           valobj);
                 }
                 else
                 {
@@ -6025,19 +6025,19 @@ ClangASTContext::GetChildClangTypeAtInde
                 {
                     child_is_deref_of_parent = false;
                     bool tmp_child_is_deref_of_parent = false;
-                    return pointee_clang_type.GetChildClangTypeAtIndex (exe_ctx,
-                                                                        idx,
-                                                                        transparent_pointers,
-                                                                        omit_empty_base_classes,
-                                                                        ignore_array_bounds,
-                                                                        child_name,
-                                                                        child_byte_size,
-                                                                        child_byte_offset,
-                                                                        child_bitfield_bit_size,
-                                                                        child_bitfield_bit_offset,
-                                                                        child_is_base_class,
-                                                                        tmp_child_is_deref_of_parent,
-                                                                        valobj);
+                    return pointee_clang_type.GetChildCompilerTypeAtIndex (exe_ctx,
+                                                                           idx,
+                                                                           transparent_pointers,
+                                                                           omit_empty_base_classes,
+                                                                           ignore_array_bounds,
+                                                                           child_name,
+                                                                           child_byte_size,
+                                                                           child_byte_offset,
+                                                                           child_bitfield_bit_size,
+                                                                           child_bitfield_bit_offset,
+                                                                           child_is_base_class,
+                                                                           tmp_child_is_deref_of_parent,
+                                                                           valobj);
                 }
                 else
                 {
@@ -6062,56 +6062,56 @@ ClangASTContext::GetChildClangTypeAtInde
         case clang::Type::Typedef:
         {
             CompilerType typedefed_clang_type (getASTContext(), llvm::cast<clang::TypedefType>(parent_qual_type)->getDecl()->getUnderlyingType());
-            return typedefed_clang_type.GetChildClangTypeAtIndex (exe_ctx,
-                                                                  idx,
-                                                                  transparent_pointers,
-                                                                  omit_empty_base_classes,
-                                                                  ignore_array_bounds,
-                                                                  child_name,
-                                                                  child_byte_size,
-                                                                  child_byte_offset,
-                                                                  child_bitfield_bit_size,
-                                                                  child_bitfield_bit_offset,
-                                                                  child_is_base_class,
-                                                                  child_is_deref_of_parent,
-                                                                  valobj);
+            return typedefed_clang_type.GetChildCompilerTypeAtIndex (exe_ctx,
+                                                                     idx,
+                                                                     transparent_pointers,
+                                                                     omit_empty_base_classes,
+                                                                     ignore_array_bounds,
+                                                                     child_name,
+                                                                     child_byte_size,
+                                                                     child_byte_offset,
+                                                                     child_bitfield_bit_size,
+                                                                     child_bitfield_bit_offset,
+                                                                     child_is_base_class,
+                                                                     child_is_deref_of_parent,
+                                                                     valobj);
         }
             break;
             
         case clang::Type::Elaborated:
         {
             CompilerType elaborated_clang_type (getASTContext(), llvm::cast<clang::ElaboratedType>(parent_qual_type)->getNamedType());
-            return elaborated_clang_type.GetChildClangTypeAtIndex (exe_ctx,
-                                                                   idx,
-                                                                   transparent_pointers,
-                                                                   omit_empty_base_classes,
-                                                                   ignore_array_bounds,
-                                                                   child_name,
-                                                                   child_byte_size,
-                                                                   child_byte_offset,
-                                                                   child_bitfield_bit_size,
-                                                                   child_bitfield_bit_offset,
-                                                                   child_is_base_class,
-                                                                   child_is_deref_of_parent,
-                                                                   valobj);
+            return elaborated_clang_type.GetChildCompilerTypeAtIndex (exe_ctx,
+                                                                      idx,
+                                                                      transparent_pointers,
+                                                                      omit_empty_base_classes,
+                                                                      ignore_array_bounds,
+                                                                      child_name,
+                                                                      child_byte_size,
+                                                                      child_byte_offset,
+                                                                      child_bitfield_bit_size,
+                                                                      child_bitfield_bit_offset,
+                                                                      child_is_base_class,
+                                                                      child_is_deref_of_parent,
+                                                                      valobj);
         }
             
         case clang::Type::Paren:
         {
             CompilerType paren_clang_type (getASTContext(), llvm::cast<clang::ParenType>(parent_qual_type)->desugar());
-            return paren_clang_type.GetChildClangTypeAtIndex (exe_ctx,
-                                                              idx,
-                                                              transparent_pointers,
-                                                              omit_empty_base_classes,
-                                                              ignore_array_bounds,
-                                                              child_name,
-                                                              child_byte_size,
-                                                              child_byte_offset,
-                                                              child_bitfield_bit_size,
-                                                              child_bitfield_bit_offset,
-                                                              child_is_base_class,
-                                                              child_is_deref_of_parent,
-                                                              valobj);
+            return paren_clang_type.GetChildCompilerTypeAtIndex (exe_ctx,
+                                                                 idx,
+                                                                 transparent_pointers,
+                                                                 omit_empty_base_classes,
+                                                                 ignore_array_bounds,
+                                                                 child_name,
+                                                                 child_byte_size,
+                                                                 child_byte_offset,
+                                                                 child_bitfield_bit_size,
+                                                                 child_bitfield_bit_offset,
+                                                                 child_is_base_class,
+                                                                 child_is_deref_of_parent,
+                                                                 valobj);
         }
             
             

Modified: lldb/trunk/source/Symbol/CompilerType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CompilerType.cpp?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/CompilerType.cpp (original)
+++ lldb/trunk/source/Symbol/CompilerType.cpp Mon Sep 21 11:48:48 2015
@@ -752,36 +752,36 @@ CompilerType::GetIndexOfFieldWithName (c
 
 
 CompilerType
-CompilerType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
-                                        size_t idx,
-                                        bool transparent_pointers,
-                                        bool omit_empty_base_classes,
-                                        bool ignore_array_bounds,
-                                        std::string& child_name,
-                                        uint32_t &child_byte_size,
-                                        int32_t &child_byte_offset,
-                                        uint32_t &child_bitfield_bit_size,
-                                        uint32_t &child_bitfield_bit_offset,
-                                        bool &child_is_base_class,
-                                        bool &child_is_deref_of_parent,
-                                        ValueObject *valobj) const
+CompilerType::GetChildCompilerTypeAtIndex (ExecutionContext *exe_ctx,
+                                           size_t idx,
+                                           bool transparent_pointers,
+                                           bool omit_empty_base_classes,
+                                           bool ignore_array_bounds,
+                                           std::string& child_name,
+                                           uint32_t &child_byte_size,
+                                           int32_t &child_byte_offset,
+                                           uint32_t &child_bitfield_bit_size,
+                                           uint32_t &child_bitfield_bit_offset,
+                                           bool &child_is_base_class,
+                                           bool &child_is_deref_of_parent,
+                                           ValueObject *valobj) const
 {
     if (!IsValid())
         return CompilerType();
-    return m_type_system->GetChildClangTypeAtIndex(m_type,
-                                                   exe_ctx,
-                                                   idx,
-                                                   transparent_pointers,
-                                                   omit_empty_base_classes,
-                                                   ignore_array_bounds,
-                                                   child_name,
-                                                   child_byte_size,
-                                                   child_byte_offset,
-                                                   child_bitfield_bit_size,
-                                                   child_bitfield_bit_offset,
-                                                   child_is_base_class,
-                                                   child_is_deref_of_parent,
-                                                   valobj);
+    return m_type_system->GetChildCompilerTypeAtIndex(m_type,
+                                                      exe_ctx,
+                                                      idx,
+                                                      transparent_pointers,
+                                                      omit_empty_base_classes,
+                                                      ignore_array_bounds,
+                                                      child_name,
+                                                      child_byte_size,
+                                                      child_byte_offset,
+                                                      child_bitfield_bit_size,
+                                                      child_bitfield_bit_offset,
+                                                      child_is_base_class,
+                                                      child_is_deref_of_parent,
+                                                      valobj);
 }
 
 // Look for a child member (doesn't include base classes, but it does include

Modified: lldb/trunk/source/Symbol/GoASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/GoASTContext.cpp?rev=248175&r1=248174&r2=248175&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/GoASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/GoASTContext.cpp Mon Sep 21 11:48:48 2015
@@ -1095,11 +1095,11 @@ GoASTContext::GetFieldAtIndex(void *type
 }
 
 CompilerType
-GoASTContext::GetChildClangTypeAtIndex(void *type, ExecutionContext *exe_ctx, size_t idx, bool transparent_pointers,
-                                       bool omit_empty_base_classes, bool ignore_array_bounds, std::string &child_name,
-                                       uint32_t &child_byte_size, int32_t &child_byte_offset,
-                                       uint32_t &child_bitfield_bit_size, uint32_t &child_bitfield_bit_offset,
-                                       bool &child_is_base_class, bool &child_is_deref_of_parent, ValueObject *valobj)
+GoASTContext::GetChildCompilerTypeAtIndex(void *type, ExecutionContext *exe_ctx, size_t idx, bool transparent_pointers,
+                                          bool omit_empty_base_classes, bool ignore_array_bounds, std::string &child_name,
+                                          uint32_t &child_byte_size, int32_t &child_byte_offset,
+                                          uint32_t &child_bitfield_bit_size, uint32_t &child_bitfield_bit_offset,
+                                          bool &child_is_base_class, bool &child_is_deref_of_parent, ValueObject *valobj)
 {
     child_name.clear();
     child_byte_size = 0;
@@ -1129,7 +1129,7 @@ GoASTContext::GetChildClangTypeAtIndex(v
         if (transparent_pointers && pointee.IsAggregateType())
         {
             bool tmp_child_is_deref_of_parent = false;
-            return pointee.GetChildClangTypeAtIndex(exe_ctx, idx, transparent_pointers, omit_empty_base_classes,
+            return pointee.GetChildCompilerTypeAtIndex(exe_ctx, idx, transparent_pointers, omit_empty_base_classes,
                                                     ignore_array_bounds, child_name, child_byte_size, child_byte_offset,
                                                     child_bitfield_bit_size, child_bitfield_bit_offset,
                                                     child_is_base_class, tmp_child_is_deref_of_parent, valobj);
@@ -1171,7 +1171,7 @@ GoASTContext::GetChildClangTypeAtIndex(v
     }
     else if (t->IsTypedef())
     {
-        return t->GetElementType().GetChildClangTypeAtIndex(
+        return t->GetElementType().GetChildCompilerTypeAtIndex(
             exe_ctx, idx, transparent_pointers, omit_empty_base_classes, ignore_array_bounds, child_name,
             child_byte_size, child_byte_offset, child_bitfield_bit_size, child_bitfield_bit_offset, child_is_base_class,
             child_is_deref_of_parent, valobj);




More information about the lldb-commits mailing list