Swift: Add an overall PointerType.

Author: geoffw0

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/PointerTypes.qll

@@ -5,6 +5,22 @@
 
 import swift
 
+/**
+ * A type that is used as a pointer in Swift, such as `UnsafePointer`,
+ * `UnsafeBufferPointer` and similar types.
+ */
+class PointerType extends Type {
+  PointerType() {
+    this instanceof UnsafeTypedPointerType or
+    this instanceof UnsafeRawPointerType or
+    this instanceof OpaquePointerType or
+    this instanceof AutoreleasingUnsafeMutablePointerType or
+    this instanceof UnmanagedType or
+    this instanceof CVaListPointerType or
+    this instanceof ManagedBufferPointerType
+  }
+}
+
 /**
  * A Swift unsafe typed pointer type such as `UnsafePointer`,
  * `UnsafeMutablePointer` or `UnsafeBufferPointer`.

swift/ql/test/library-tests/elements/type/pointertypes/pointertypes.expected

@@ -1,13 +1,13 @@
-| pointers.swift:11:6:11:6 | p1 | UnsafePointer<Int> | UnsafeTypedPointerType |
-| pointers.swift:12:6:12:6 | p2 | UnsafeMutablePointer<UInt8> | UnsafeTypedPointerType |
-| pointers.swift:13:6:13:6 | p3 | UnsafeBufferPointer<String> | UnsafeTypedPointerType |
-| pointers.swift:14:6:14:6 | p4 | UnsafeMutableBufferPointer<MyClass> | UnsafeTypedPointerType |
-| pointers.swift:15:6:15:6 | p5 | UnsafeRawPointer | UnsafeRawPointerType |
-| pointers.swift:16:6:16:6 | p6 | UnsafeMutableRawPointer | UnsafeRawPointerType |
-| pointers.swift:17:6:17:6 | p7 | UnsafeRawBufferPointer | UnsafeRawPointerType |
-| pointers.swift:18:6:18:6 | p8 | UnsafeMutableRawBufferPointer | UnsafeRawPointerType |
-| pointers.swift:20:6:20:6 | op | OpaquePointer | OpaquePointerType |
-| pointers.swift:21:6:21:6 | aump | AutoreleasingUnsafeMutablePointer<UInt8> | AutoreleasingUnsafeMutablePointerType |
-| pointers.swift:22:6:22:6 | um | Unmanaged<MyClass> | UnmanagedType |
-| pointers.swift:23:6:23:6 | cvlp | CVaListPointer | CVaListPointerType |
-| pointers.swift:25:6:25:6 | mbp | ManagedBufferPointer<Int, MyClass> | ManagedBufferPointerType |
+| pointers.swift:11:6:11:6 | p1 | UnsafePointer<Int> | PointerType, UnsafeTypedPointerType |
+| pointers.swift:12:6:12:6 | p2 | UnsafeMutablePointer<UInt8> | PointerType, UnsafeTypedPointerType |
+| pointers.swift:13:6:13:6 | p3 | UnsafeBufferPointer<String> | PointerType, UnsafeTypedPointerType |
+| pointers.swift:14:6:14:6 | p4 | UnsafeMutableBufferPointer<MyClass> | PointerType, UnsafeTypedPointerType |
+| pointers.swift:15:6:15:6 | p5 | UnsafeRawPointer | PointerType, UnsafeRawPointerType |
+| pointers.swift:16:6:16:6 | p6 | UnsafeMutableRawPointer | PointerType, UnsafeRawPointerType |
+| pointers.swift:17:6:17:6 | p7 | UnsafeRawBufferPointer | PointerType, UnsafeRawPointerType |
+| pointers.swift:18:6:18:6 | p8 | UnsafeMutableRawBufferPointer | PointerType, UnsafeRawPointerType |
+| pointers.swift:20:6:20:6 | op | OpaquePointer | OpaquePointerType, PointerType |
+| pointers.swift:21:6:21:6 | aump | AutoreleasingUnsafeMutablePointer<UInt8> | AutoreleasingUnsafeMutablePointerType, PointerType |
+| pointers.swift:22:6:22:6 | um | Unmanaged<MyClass> | PointerType, UnmanagedType |
+| pointers.swift:23:6:23:6 | cvlp | CVaListPointer | CVaListPointerType, PointerType |
+| pointers.swift:25:6:25:6 | mbp | ManagedBufferPointer<Int, MyClass> | ManagedBufferPointerType, PointerType |

swift/ql/test/library-tests/elements/type/pointertypes/pointertypes.ql

@@ -2,6 +2,8 @@ import swift
 import codeql.swift.frameworks.StandardLibrary.PointerTypes
 
 string describe(Type t) {
+  t instanceof PointerType and result = "PointerType"
+  or
   t instanceof BuiltinRawPointerType and result = "BuiltinRawPointerType"
   or
   t instanceof UnsafeTypedPointerType and result = "UnsafeTypedPointerType"