C++: Exclude name-header mappings for specializations

Author: lcartey

cpp/common/src/ext/stdcpp14.generated.names.model.yml

@@ -200,7 +200,6 @@ extensions:
   - [C++14, complex, std, value_type]
   - [C++14, complex, std, complex]
   - [C++14, chrono, std, type]
-  - [C++14, chrono, std, common_type]
   - [C++14, chrono, 'std::__parse_int', type]
   - [C++14, chrono, 'std::chrono', clock]
   - [C++14, chrono, 'std::chrono', period]
@@ -244,9 +243,7 @@ extensions:
   - [C++14, tuple, std, type]
   - [C++14, tuple, std, tuple]
   - [C++14, tuple, std, is_constructible]
-  - [C++14, tuple, std, uses_allocator]
   - [C++14, tuple, std, tuple_element]
-  - [C++14, tuple, std, tuple_size]
   - [C++14, condition_variable, std, steady_clock]
   - [C++14, condition_variable, std, system_clock]
   - [C++14, condition_variable, std, native_handle_type]
@@ -290,7 +287,6 @@ extensions:
   - [C++14, future, std, launch]
   - [C++14, future, std, future_errc]
   - [C++14, future, std, future_status]
-  - [C++14, future, std, uses_allocator]
   - [C++14, list, std, value_type]
   - [C++14, list, std, const_iterator]
   - [C++14, list, std, const_reference]
@@ -336,7 +332,6 @@ extensions:
   - [C++14, vector, std, reverse_iterator]
   - [C++14, vector, std, const_pointer]
   - [C++14, vector, std, allocator_type]
-  - [C++14, vector, std, hash]
   - [C++14, vector, std, const_reverse_iterator]
   - [C++14, vector, std, vector]
   - [C++14, queue, std, value_type]
@@ -347,14 +342,12 @@ extensions:
   - [C++14, queue, std, value_compare]
   - [C++14, queue, std, priority_queue]
   - [C++14, queue, std, queue]
-  - [C++14, queue, std, uses_allocator]
   - [C++14, stack, std, value_type]
   - [C++14, stack, std, const_reference]
   - [C++14, stack, std, reference]
   - [C++14, stack, std, size_type]
   - [C++14, stack, std, container_type]
   - [C++14, stack, std, stack]
-  - [C++14, stack, std, uses_allocator]
   - [C++14, strstream, std, int_type]
   - [C++14, strstream, std, off_type]
   - [C++14, strstream, std, char_type]
@@ -870,7 +863,6 @@ extensions:
   - [C++14, memory, std, propagate_on_container_move_assignment]
   - [C++14, memory, std, propagate_on_container_copy_assignment]
   - [C++14, memory, std, other]
-  - [C++14, memory, std, hash]
   - [C++14, memory, std, allocator_arg_t]
   - [C++14, memory, std, unique_ptr]
   - [C++14, memory, std, default_delete]

scripts/generate_standard_library_models/cpp/queries/libraryTypeModel.ql

@@ -10,8 +10,13 @@ where
   declInVisibleStdNamespace(t) and
   // Do not report types from template instantiations - instead report the uninstantiated template
   not t.isFromTemplateInstantiation(_) and
-  // Ignore full tempalte specializations (partial specializations are fine)
-  not t instanceof FullClassTemplateSpecialization and
+  // Exclude all template specializations, except those where (due to an extractor bug?) the
+  // primary template is missing
+  (
+    t instanceof ClassTemplateSpecialization
+    implies
+    not exists(t.(ClassTemplateSpecialization).getPrimaryTemplate())
+  ) and
   // Remove unnamed types, because they do not have a reserved name
   not t.isAnonymous()
 select getStandard(), getAClosestStandardLibraryHeader(t.getFile()).getBaseName(),