Huge change to clean up types.
A long time ago we start with clang types that were created by the symbol files and there were many functions in lldb_private::ClangASTContext that helped. Later we create ClangASTType which contains a clang::ASTContext and an opauque QualType, but we didn't switch over to fully using it. There were a lot of places where we would pass around a raw clang_type_t and also pass along a clang::ASTContext separately. This left room for error.
This checkin change all type code over to use ClangASTType everywhere and I cleaned up the interfaces quite a bit. Any code that was in ClangASTContext that was type related, was moved over into ClangASTType. All code that used these types was switched over to use all of the new goodness.
llvm-svn: 186130
diff --git a/lldb/source/Symbol/Variable.cpp b/lldb/source/Symbol/Variable.cpp
index bcbea2f..36439b5 100644
--- a/lldb/source/Symbol/Variable.cpp
+++ b/lldb/source/Symbol/Variable.cpp
@@ -547,18 +547,13 @@
{
// We are in a type parsing child members
- const uint32_t num_bases = ClangASTContext::GetNumDirectBaseClasses(clang_type.GetASTContext(),
- clang_type.GetOpaqueQualType());
+ const uint32_t num_bases = clang_type.GetNumDirectBaseClasses();
if (num_bases > 0)
{
for (uint32_t i = 0; i < num_bases; ++i)
{
- ClangASTType base_class_type (clang_type.GetASTContext(),
- ClangASTContext::GetDirectBaseClassAtIndex (clang_type.GetASTContext(),
- clang_type.GetOpaqueQualType(),
- i,
- NULL));
+ ClangASTType base_class_type (clang_type.GetDirectBaseClassAtIndex (i, NULL));
PrivateAutoCompleteMembers (frame,
partial_member_name,
@@ -570,18 +565,13 @@
}
}
- const uint32_t num_vbases = ClangASTContext::GetNumVirtualBaseClasses(clang_type.GetASTContext(),
- clang_type.GetOpaqueQualType());
+ const uint32_t num_vbases = clang_type.GetNumVirtualBaseClasses();
if (num_vbases > 0)
{
for (uint32_t i = 0; i < num_vbases; ++i)
{
- ClangASTType vbase_class_type (clang_type.GetASTContext(),
- ClangASTContext::GetVirtualBaseClassAtIndex(clang_type.GetASTContext(),
- clang_type.GetOpaqueQualType(),
- i,
- NULL));
+ ClangASTType vbase_class_type (clang_type.GetVirtualBaseClassAtIndex(i,NULL));
PrivateAutoCompleteMembers (frame,
partial_member_name,
@@ -594,8 +584,7 @@
}
// We are in a type parsing child members
- const uint32_t num_fields = ClangASTContext::GetNumFields(clang_type.GetASTContext(),
- clang_type.GetOpaqueQualType());
+ const uint32_t num_fields = clang_type.GetNumFields();
if (num_fields > 0)
{
@@ -603,20 +592,13 @@
{
std::string member_name;
- lldb::clang_type_t member_type = ClangASTContext::GetFieldAtIndex (clang_type.GetASTContext(),
- clang_type.GetOpaqueQualType(),
- i,
- member_name,
- NULL,
- NULL,
- NULL);
+ ClangASTType member_clang_type = clang_type.GetFieldAtIndex (i, member_name, NULL, NULL, NULL);
if (partial_member_name.empty() ||
member_name.find(partial_member_name) == 0)
{
if (member_name == partial_member_name)
{
- ClangASTType member_clang_type (clang_type.GetASTContext(), member_type);
PrivateAutoComplete (frame,
partial_path,
prefix_path + member_name, // Anything that has been resolved already will be in here
@@ -683,7 +665,7 @@
case eTypeClassPointer:
{
bool omit_empty_base_classes = true;
- if (ClangASTContext::GetNumChildren (clang_type.GetASTContext(), clang_type.GetPointeeType(), omit_empty_base_classes) > 0)
+ if (clang_type.GetNumChildren (omit_empty_base_classes) > 0)
matches.AppendString (prefix_path + "->");
else
{
@@ -747,7 +729,7 @@
{
case lldb::eTypeClassPointer:
{
- ClangASTType pointee_type(clang_type.GetASTContext(), clang_type.GetPointeeType());
+ ClangASTType pointee_type(clang_type.GetPointeeType());
if (partial_path[2])
{
// If there is more after the "->", then search deeper
@@ -859,7 +841,7 @@
Type *variable_type = variable->GetType();
if (variable_type)
{
- ClangASTType variable_clang_type (variable_type->GetClangAST(), variable_type->GetClangForwardType());
+ ClangASTType variable_clang_type (variable_type->GetClangForwardType());
PrivateAutoComplete (frame,
remaining_partial_path,
prefix_path + token, // Anything that has been resolved already will be in here