Swift: Update similar cases.

Author: geoffw0

swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql

@@ -58,39 +58,41 @@ class StringLengthConflationConfiguration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node node, string flowstate) {
     // result of a call to `String.count`
     exists(MemberRefExpr member |
-      member.getBase().getType().getName() = "String" and
+      member.getBase().getType().(NominalType).getABaseType*().getName() = "String" and
       member.getMember().(VarDecl).getName() = "count" and
       node.asExpr() = member and
       flowstate = "String"
     )
     or
     // result of a call to `NSString.length`
     exists(MemberRefExpr member |
-      member.getBase().getType().getName() = ["NSString", "NSMutableString"] and
+      member.getBase().getType().(NominalType).getABaseType*().getName() =
+        ["NSString", "NSMutableString"] and
       member.getMember().(VarDecl).getName() = "length" and
       node.asExpr() = member and
       flowstate = "NSString"
     )
     or
     // result of a call to `String.utf8.count`
     exists(MemberRefExpr member |
-      member.getBase().getType().getName() = "String.UTF8View" and
+      member.getBase().getType().(NominalType).getABaseType*().getName() = "String.UTF8View" and
       member.getMember().(VarDecl).getName() = "count" and
       node.asExpr() = member and
       flowstate = "String.utf8"
     )
     or
     // result of a call to `String.utf16.count`
     exists(MemberRefExpr member |
-      member.getBase().getType().getName() = "String.UTF16View" and
+      member.getBase().getType().(NominalType).getABaseType*().getName() = "String.UTF16View" and
       member.getMember().(VarDecl).getName() = "count" and
       node.asExpr() = member and
       flowstate = "String.utf16"
     )
     or
     // result of a call to `String.unicodeScalars.count`
     exists(MemberRefExpr member |
-      member.getBase().getType().getName() = "String.UnicodeScalarView" and
+      member.getBase().getType().(NominalType).getABaseType*().getName() =
+        "String.UnicodeScalarView" and
       member.getMember().(VarDecl).getName() = "count" and
       node.asExpr() = member and
       flowstate = "String.unicodeScalars"