From 0d0a5960a5aba659f94a287867dbd02c9506d360 Mon Sep 17 00:00:00 2001
From: Frederic Riss <friss@apple.com>
Date: Thu, 30 Aug 2018 00:37:23 +0000
Subject: [PATCH] Provide a default implementation of
 TypeSystem::GetNumTemplateArguments

... and remove the dummy implementations from the languages that do not
support it.

llvm-svn: 341006
---
 lldb/include/lldb/Symbol/GoASTContext.h    | 4 ----
 lldb/include/lldb/Symbol/JavaASTContext.h  | 2 --
 lldb/include/lldb/Symbol/OCamlASTContext.h | 4 ----
 lldb/include/lldb/Symbol/TypeSystem.h      | 2 +-
 lldb/source/Symbol/JavaASTContext.cpp      | 5 -----
 lldb/source/Symbol/TypeSystem.cpp          | 4 ++++
 6 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/lldb/include/lldb/Symbol/GoASTContext.h b/lldb/include/lldb/Symbol/GoASTContext.h
index 29c8cdc..3942bf0 100644
--- a/lldb/include/lldb/Symbol/GoASTContext.h
+++ b/lldb/include/lldb/Symbol/GoASTContext.h
@@ -310,10 +310,6 @@ public:
                                 const char *name, bool omit_empty_base_classes,
                                 std::vector<uint32_t> &child_indexes) override;
 
-  size_t GetNumTemplateArguments(lldb::opaque_compiler_type_t type) override {
-    return 0;
-  }
-
   //----------------------------------------------------------------------
   // Dumping types
   //----------------------------------------------------------------------
diff --git a/lldb/include/lldb/Symbol/JavaASTContext.h b/lldb/include/lldb/Symbol/JavaASTContext.h
index 41a881d..6bf0bc2 100644
--- a/lldb/include/lldb/Symbol/JavaASTContext.h
+++ b/lldb/include/lldb/Symbol/JavaASTContext.h
@@ -201,8 +201,6 @@ public:
 
   unsigned GetTypeQualifiers(lldb::opaque_compiler_type_t type) override;
 
-  size_t GetNumTemplateArguments(lldb::opaque_compiler_type_t type) override;
-
   int GetFunctionArgumentCount(lldb::opaque_compiler_type_t type) override;
 
   CompilerType GetFunctionArgumentTypeAtIndex(lldb::opaque_compiler_type_t type,
diff --git a/lldb/include/lldb/Symbol/OCamlASTContext.h b/lldb/include/lldb/Symbol/OCamlASTContext.h
index 7144886..013faad 100644
--- a/lldb/include/lldb/Symbol/OCamlASTContext.h
+++ b/lldb/include/lldb/Symbol/OCamlASTContext.h
@@ -227,10 +227,6 @@ public:
                                 const char *name, bool omit_empty_base_classes,
                                 std::vector<uint32_t> &child_indexes) override;
 
-  size_t GetNumTemplateArguments(lldb::opaque_compiler_type_t type) override {
-    return 0;
-  }
-
   void DumpValue(lldb::opaque_compiler_type_t type, ExecutionContext *exe_ctx,
                  Stream *s, lldb::Format format, const DataExtractor &data,
                  lldb::offset_t data_offset, size_t data_byte_size,
diff --git a/lldb/include/lldb/Symbol/TypeSystem.h b/lldb/include/lldb/Symbol/TypeSystem.h
index 94d1b9c..fcb8441 100644
--- a/lldb/include/lldb/Symbol/TypeSystem.h
+++ b/lldb/include/lldb/Symbol/TypeSystem.h
@@ -347,7 +347,7 @@ public:
                                 const char *name, bool omit_empty_base_classes,
                                 std::vector<uint32_t> &child_indexes) = 0;
 
-  virtual size_t GetNumTemplateArguments(lldb::opaque_compiler_type_t type) = 0;
+  virtual size_t GetNumTemplateArguments(lldb::opaque_compiler_type_t type);
 
   virtual lldb::TemplateArgumentKind
   GetTemplateArgumentKind(lldb::opaque_compiler_type_t type, size_t idx);
diff --git a/lldb/source/Symbol/JavaASTContext.cpp b/lldb/source/Symbol/JavaASTContext.cpp
index ff317eb..e948d1e 100644
--- a/lldb/source/Symbol/JavaASTContext.cpp
+++ b/lldb/source/Symbol/JavaASTContext.cpp
@@ -878,11 +878,6 @@ JavaASTContext::ConvertStringToFloatValue(lldb::opaque_compiler_type_t type,
   return 0;
 }
 
-size_t
-JavaASTContext::GetNumTemplateArguments(lldb::opaque_compiler_type_t type) {
-  return 0;
-}
-
 uint32_t JavaASTContext::GetNumFields(lldb::opaque_compiler_type_t type) {
   if (JavaObjectType *obj =
           llvm::dyn_cast<JavaObjectType>(static_cast<JavaType *>(type))) {
diff --git a/lldb/source/Symbol/TypeSystem.cpp b/lldb/source/Symbol/TypeSystem.cpp
index b99f21e..b29d1a4 100644
--- a/lldb/source/Symbol/TypeSystem.cpp
+++ b/lldb/source/Symbol/TypeSystem.cpp
@@ -101,6 +101,10 @@ CompilerType TypeSystem::GetTypeForFormatters(void *type) {
   return CompilerType(this, type);
 }
 
+size_t TypeSystem::GetNumTemplateArguments(lldb::opaque_compiler_type_t type) {
+  return 0;
+}
+
 TemplateArgumentKind
 TypeSystem::GetTemplateArgumentKind(opaque_compiler_type_t type, size_t idx) {
   return eTemplateArgumentKindNull;
-- 
2.7.4