Swift: Fix QL-for-QL warnings.

geoffw0 · geoffw0 · commit 4c8225724b45 · 2023-06-02T12:21:17.000+01:00
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll
@@ -47,8 +47,6 @@ private class CollectionFieldsInheritTaint extends TaintInheritingContent,
   DataFlow::Content::FieldContent
 {
   CollectionFieldsInheritTaint() {
-    this.getField()
-        .(FieldDecl)
-        .hasQualifiedName(["Collection", "BidirectionalCollection"], ["first", "last"])
+    this.getField().hasQualifiedName(["Collection", "BidirectionalCollection"], ["first", "last"])
   }
 }
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/NsString.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/NsString.qll
@@ -133,7 +133,6 @@ private class NsStringFieldsInheritTaint extends TaintInheritingContent,
 {
   NsStringFieldsInheritTaint() {
     this.getField()
-        .(FieldDecl)
         .hasQualifiedName("NSString",
           [
             "utf8String", "lowercased", "localizedLowedCase", "uppercased", "localizedUppercase",
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll
@@ -36,5 +36,5 @@ private class SequenceSummaries extends SummaryModelCsv {
 private class SequenceFieldsInheritTaint extends TaintInheritingContent,
   DataFlow::Content::FieldContent
 {
-  SequenceFieldsInheritTaint() { this.getField().(FieldDecl).hasQualifiedName("Sequence", "lazy") }
+  SequenceFieldsInheritTaint() { this.getField().hasQualifiedName("Sequence", "lazy") }
 }
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll
@@ -125,7 +125,6 @@ private class StringFieldsInheritTaint extends TaintInheritingContent,
 {
   StringFieldsInheritTaint() {
     this.getField()
-        .(FieldDecl)
         .hasQualifiedName(["String", "StringProtocol"],
           [
             "unicodeScalars", "utf8", "utf16", "lazy", "utf8CString", "description",

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,6 @@ private class CollectionFieldsInheritTaint extends TaintInheritingContent,`
`47`	`47`	`DataFlow::Content::FieldContent`
`48`	`48`	`{`
`49`	`49`	`CollectionFieldsInheritTaint() {`
`50`		`- this.getField()`
`51`		`- .(FieldDecl)`
`52`		`- .hasQualifiedName(["Collection", "BidirectionalCollection"], ["first", "last"])`
	`50`	`+ this.getField().hasQualifiedName(["Collection", "BidirectionalCollection"], ["first", "last"])`
`53`	`51`	`}`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ private class NsStringFieldsInheritTaint extends TaintInheritingContent,`
`133`	`133`	`{`
`134`	`134`	`NsStringFieldsInheritTaint() {`
`135`	`135`	`this.getField()`
`136`		`- .(FieldDecl)`
`137`	`136`	`.hasQualifiedName("NSString",`
`138`	`137`	`[`
`139`	`138`	`"utf8String", "lowercased", "localizedLowedCase", "uppercased", "localizedUppercase",`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,5 @@ private class SequenceSummaries extends SummaryModelCsv {`
`36`	`36`	`private class SequenceFieldsInheritTaint extends TaintInheritingContent,`
`37`	`37`	`DataFlow::Content::FieldContent`
`38`	`38`	`{`
`39`		`- SequenceFieldsInheritTaint() { this.getField().(FieldDecl).hasQualifiedName("Sequence", "lazy") }`
	`39`	`+ SequenceFieldsInheritTaint() { this.getField().hasQualifiedName("Sequence", "lazy") }`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ private class StringFieldsInheritTaint extends TaintInheritingContent,`
`125`	`125`	`{`
`126`	`126`	`StringFieldsInheritTaint() {`
`127`	`127`	`this.getField()`
`128`		`- .(FieldDecl)`
`129`	`128`	`.hasQualifiedName(["String", "StringProtocol"],`
`130`	`129`	`[`
`131`	`130`	`"unicodeScalars", "utf8", "utf16", "lazy", "utf8CString", "description",`