Swift: use createEntry in the whole type visitor

Author: redsun82

swift/extractor/visitors/TypeVisitor.cpp

@@ -122,13 +122,13 @@ void TypeVisitor::visitParenType(swift::ParenType* type) {
 }
 
 codeql::OptionalType TypeVisitor::translateOptionalType(const swift::OptionalType& type) {
-  codeql::OptionalType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   fillUnarySyntaxSugarType(type, entry);
   return entry;
 }
 
 codeql::ArraySliceType TypeVisitor::translateArraySliceType(const swift::ArraySliceType& type) {
-  codeql::ArraySliceType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   fillUnarySyntaxSugarType(type, entry);
   return entry;
 }
@@ -163,7 +163,7 @@ void TypeVisitor::visitLValueType(swift::LValueType* type) {
 
 codeql::PrimaryArchetypeType TypeVisitor::translatePrimaryArchetypeType(
     const swift::PrimaryArchetypeType& type) {
-  PrimaryArchetypeType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   fillArchetypeType(type, entry);
   return entry;
 }
@@ -183,7 +183,6 @@ void TypeVisitor::fillUnarySyntaxSugarType(const swift::UnarySyntaxSugarType& ty
                                            codeql::UnarySyntaxSugarType& entry) {
   assert(type.getBaseType() && "expect UnarySyntaxSugarType to have BaseType");
   entry.base_type = dispatcher_.fetchLabel(type.getBaseType());
-  fillType(type, entry);
 }
 
 void TypeVisitor::emitAnyFunctionType(const swift::AnyFunctionType* type,
@@ -230,7 +229,7 @@ void TypeVisitor::emitAnyGenericType(swift::AnyGenericType* type,
 
 codeql::NestedArchetypeType TypeVisitor::translateNestedArchetypeType(
     const swift::NestedArchetypeType& type) {
-  codeql::NestedArchetypeType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   entry.parent = dispatcher_.fetchLabel(type.getParent());
   entry.associated_type_declaration = dispatcher_.fetchLabel(type.getAssocType());
   fillArchetypeType(type, entry);
@@ -247,34 +246,30 @@ void TypeVisitor::fillArchetypeType(const swift::ArchetypeType& type, ArchetypeT
   entry.name = type.getName().str().str();
   entry.protocols = dispatcher_.fetchRepeatedLabels(type.getConformsTo());
   entry.superclass = dispatcher_.fetchOptionalLabel(type.getSuperclass());
-  fillType(type, entry);
 }
 
 codeql::ExistentialType TypeVisitor::translateExistentialType(const swift::ExistentialType& type) {
-  codeql::ExistentialType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   entry.constraint = dispatcher_.fetchLabel(type.getConstraintType());
-  fillType(type, entry);
   return entry;
 }
 
 codeql::DynamicSelfType TypeVisitor::translateDynamicSelfType(const swift::DynamicSelfType& type) {
-  codeql::DynamicSelfType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   entry.static_self_type = dispatcher_.fetchLabel(type.getSelfType());
-  fillType(type, entry);
   return entry;
 }
 
 codeql::VariadicSequenceType TypeVisitor::translateVariadicSequenceType(
     const swift::VariadicSequenceType& type) {
-  codeql::VariadicSequenceType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   fillUnarySyntaxSugarType(type, entry);
   return entry;
 }
 
 codeql::InOutType TypeVisitor::translateInOutType(const swift::InOutType& type) {
-  codeql::InOutType entry{dispatcher_.assignNewLabel(type)};
+  auto entry = createEntry(type);
   entry.object_type = dispatcher_.fetchLabel(type.getObjectType());
-  fillType(type, entry);
   return entry;
 }