Merge pull request #264 from Teemperor/RemoveGenericArgumentKindMaster

[upstreaming] Move GetGenericArgumentKind to SwiftASTContext

Author: Teemperor

lldb/include/lldb/Symbol/CompilerType.h

@@ -333,7 +333,6 @@ class CompilerType {
   lldb::TemplateArgumentKind GetTemplateArgumentKind(size_t idx) const;
   CompilerType GetTypeTemplateArgument(size_t idx) const;
 
-  lldb::GenericKind GetGenericArgumentKind(size_t idx) const;
   CompilerType GetGenericArgumentType(size_t idx) const;
 
   // Returns the value of the template argument and its type.

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -593,7 +593,7 @@ class SwiftASTContext : public TypeSystem {
 
   size_t GetNumTemplateArguments(void *type) override;
 
-  lldb::GenericKind GetGenericArgumentKind(void *type, size_t idx) override;
+  lldb::GenericKind GetGenericArgumentKind(void *type, size_t idx);
   CompilerType GetUnboundGenericType(void *type, size_t idx);
   CompilerType GetBoundGenericType(void *type, size_t idx);
   CompilerType GetGenericArgumentType(void *type, size_t idx) override;

lldb/include/lldb/Symbol/TypeSystem.h

@@ -386,7 +386,6 @@ class TypeSystem : public PluginInterface {
   virtual llvm::Optional<CompilerType::IntegralTemplateArgument>
   GetIntegralTemplateArgument(lldb::opaque_compiler_type_t type, size_t idx);
 
-  virtual lldb::GenericKind GetGenericArgumentKind(void *type, size_t idx);
   virtual CompilerType GetGenericArgumentType(void *type, size_t idx);
 
   // Dumping types

lldb/source/Symbol/CompilerType.cpp

@@ -717,12 +717,6 @@ CompilerType CompilerType::GetTypeTemplateArgument(size_t idx) const {
   return CompilerType();
 }
 
-GenericKind CompilerType::GetGenericArgumentKind(size_t idx) const {
-  if (IsValid())
-    return m_type_system->GetGenericArgumentKind(m_type, idx);
-  return eNullGenericKindType;
-}
-
 CompilerType CompilerType::GetGenericArgumentType(size_t idx) const {
   if (IsValid()) {
     return m_type_system->GetGenericArgumentType(m_type, idx);

lldb/source/Symbol/TypeSystem.cpp

@@ -141,10 +141,6 @@ CompilerType TypeSystem::GetTypeTemplateArgument(opaque_compiler_type_t type,
   return CompilerType();
 }
 
-GenericKind TypeSystem::GetGenericArgumentKind(void *type, size_t idx) {
-  return eNullGenericKindType;
-}
-
 CompilerType TypeSystem::GetGenericArgumentType(void *type, size_t idx) {
   return CompilerType();
 }