Swift: fix an incorrect merge conflict resolution

rdmarsh2 · rdmarsh2 · commit ba250140a88d · 2023-11-30T14:55:14.000Z
diff --git a/swift/extractor/translators/PatternTranslator.cpp b/swift/extractor/translators/PatternTranslator.cpp
@@ -5,7 +5,6 @@ namespace codeql {
 codeql::NamedPattern PatternTranslator::translateNamedPattern(const swift::NamedPattern& pattern) {
 
   auto entry = createPatternEntry(pattern);
-  entry.name = pattern.getNameStr().str();
   entry.var_decl = dispatcher.fetchLabel(pattern.getDecl());
   return entry;
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ namespace codeql {`
`5`	`5`	`codeql::NamedPattern PatternTranslator::translateNamedPattern(const swift::NamedPattern& pattern) {`
`6`	`6`
`7`	`7`	`auto entry = createPatternEntry(pattern);`
`8`		`- entry.name = pattern.getNameStr().str();`
`9`	`8`	`entry.var_decl = dispatcher.fetchLabel(pattern.getDecl());`
`10`	`9`	`return entry;`
`11`	`10`	`}`