Disabled lookups for the Objective-C builtin type "id;"
the compiler should pick this type up automatically.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@143094 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index 64dea9c..9acf8c2 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -2642,34 +2642,39 @@
}
}
}
- }
+ }
- TypeList types;
- SymbolContext null_sc;
+ static ConstString id_name("id");
- if (module_sp && namespace_decl)
- module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
- else
- target->GetImages().FindTypes (null_sc, name, true, 1, types);
-
- if (types.GetSize())
+ if (name != id_name)
{
- TypeSP type_sp = types.GetTypeAtIndex(0);
+ TypeList types;
+ SymbolContext null_sc;
- if (log)
+ if (module_sp && namespace_decl)
+ module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
+ else
+ target->GetImages().FindTypes (null_sc, name, true, 1, types);
+
+ if (types.GetSize())
{
- const char *name_string = type_sp->GetName().GetCString();
+ TypeSP type_sp = types.GetTypeAtIndex(0);
- log->Printf(" FEVD[%u] Matching type found for \"%s\": %s",
- current_id,
- name.GetCString(),
- (name_string ? name_string : "<anonymous>"));
- }
+ if (log)
+ {
+ const char *name_string = type_sp->GetName().GetCString();
+
+ log->Printf(" FEVD[%u] Matching type found for \"%s\": %s",
+ current_id,
+ name.GetCString(),
+ (name_string ? name_string : "<anonymous>"));
+ }
- TypeFromUser user_type(type_sp->GetClangFullType(),
- type_sp->GetClangAST());
-
- AddOneType(context, user_type, current_id, false);
+ TypeFromUser user_type(type_sp->GetClangFullType(),
+ type_sp->GetClangAST());
+
+ AddOneType(context, user_type, current_id, false);
+ }
}
}