hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Swift: accept explicit any in existential type name

Browse Source
This commit is contained in:
Paolo Tranquilli
2024-03-27 13:49:15 +01:00
parent d9c40488bb
commit 0243d9f2b9
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/ql/integration-tests/posix-only/deduplication/Decls.expected
View File

@@ -46,8 +46,8 @@
| Sources/deduplication/def.swift:26:36:26:39 | _ | ParamDecl | A [GenericTypeParamType] |
| Sources/deduplication/def.swift:26:42:26:45 | _ | ParamDecl | B [GenericTypeParamType] |
| Sources/deduplication/def.swift:26:48:26:51 | _ | ParamDecl | C [GenericTypeParamType] |
| Sources/deduplication/def.swift:28:1:28:21 | Protocol1 | ProtocolDecl | Protocol1.Protocol [MetatypeType] |
| Sources/deduplication/def.swift:29:1:31:1 | Protocol2 | ProtocolDecl | Protocol2.Protocol [MetatypeType] |
| Sources/deduplication/def.swift:28:1:28:21 | Protocol1 | ProtocolDecl | Protocol1.Type [MetatypeType] |
| Sources/deduplication/def.swift:29:1:31:1 | Protocol2 | ProtocolDecl | Protocol2.Type [MetatypeType] |
| Sources/deduplication/def.swift:30:5:30:20 | Associated | AssociatedTypeDecl | Self.Associated.Type [MetatypeType] |
| Sources/deduplication/def.swift:32:1:32:14 | Class | ClassDecl | Class.Type [MetatypeType] |
| Sources/deduplication/def.swift:32:7:32:7 | Class.deinit() | Deinitializer | (Class) -> () -> () [FunctionType] |

2
swift/ql/test/extractor-tests/expressions/all.expected
View File

@@ -31,7 +31,7 @@
| expressions.swift:15:11:15:11 | Int.Type | TypeExpr |
| expressions.swift:15:14:15:14 | 0 | IntegerLiteralExpr |
| expressions.swift:16:11:16:11 | AnError.Type | TypeExpr |
| expressions.swift:16:11:16:19 | (Error) ... | ErasureExpr |
| expressions.swift:16:11:16:19 | (any Error) ... | ErasureExpr |
| expressions.swift:16:11:16:19 | .failed | MethodLookupExpr |
| expressions.swift:16:19:16:19 | failed | DeclRefExpr |
| expressions.swift:20:1:20:16 | try! ... | ForceTryExpr |

2
swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.expected
View File

@@ -1,5 +1,5 @@
| implicit_conversions.swift:2:3:2:3 | (UnsafePointer<CChar>) ... | StringToPointerExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:2:3:2:3 | Hello |
| implicit_conversions.swift:4:16:4:16 | (Int?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:4:16:4:16 | 42 |
| implicit_conversions.swift:5:25:5:25 | (Equatable) ... | ErasureExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:5:25:5:25 | 42 |
| implicit_conversions.swift:5:25:5:25 | (any Equatable) ... | ErasureExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:5:25:5:25 | 42 |
| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | AbiSafeConversionExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:3:12:5 | .b |
| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:9:12:10 | { ... } |

2
swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr_getType.expected
View File

@@ -1,5 +1,5 @@
| implicit_conversions.swift:2:3:2:3 | (UnsafePointer<CChar>) ... | UnsafePointer<CChar> |
| implicit_conversions.swift:4:16:4:16 | (Int?) ... | Int? |
| implicit_conversions.swift:5:25:5:25 | (Equatable) ... | Equatable |
| implicit_conversions.swift:5:25:5:25 | (any Equatable) ... | any Equatable |
| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | @lvalue (() -> Void)? |
| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | (() -> Void)? |

6
swift/ql/test/extractor-tests/generated/type/ExistentialType/ExistentialType.expected
View File

@@ -1,3 +1,3 @@
| ExplicitExistential | getName: | ExplicitExistential | getCanonicalType: | ExplicitExistential | getConstraint: | ExplicitExistential |
| ImplicitExistential | getName: | ImplicitExistential | getCanonicalType: | ImplicitExistential | getConstraint: | ImplicitExistential |
| P1 & P2 | getName: | P1 & P2 | getCanonicalType: | P1 & P2 | getConstraint: | P1 & P2 |
| any ExplicitExistential | getName: | any ExplicitExistential | getCanonicalType: | any ExplicitExistential | getConstraint: | ExplicitExistential |
| any ImplicitExistential | getName: | any ImplicitExistential | getCanonicalType: | any ImplicitExistential | getConstraint: | ImplicitExistential |
| any P1 & P2 | getName: | any P1 & P2 | getCanonicalType: | any P1 & P2 | getConstraint: | P1 & P2 |

2
swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected
View File

@@ -1 +1 @@
| C & P1 & P2 | getName: | C & P1 & P2 | getCanonicalType: | C & P1 & P2 | getInterfaceType: | \u03c4_0_0 | hasSuperclass: | yes | getNumberOfProtocols: | 2 |
| any C & P1 & P2 | getName: | any C & P1 & P2 | getCanonicalType: | any C & P1 & P2 | getInterfaceType: | \u03c4_0_0 | hasSuperclass: | yes | getNumberOfProtocols: | 2 |

4
swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType_getProtocol.expected
View File

@@ -1,2 +1,2 @@
| C & P1 & P2 | 0 | opened_archetypes.swift:3:1:3:14 | P1 |
| C & P1 & P2 | 1 | opened_archetypes.swift:9:1:9:14 | P2 |
| any C & P1 & P2 | 0 | opened_archetypes.swift:3:1:3:14 | P1 |
| any C & P1 & P2 | 1 | opened_archetypes.swift:9:1:9:14 | P2 |

2
swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType_getSuperclass.expected
View File

@@ -1 +1 @@
| C & P1 & P2 | C |
| any C & P1 & P2 | C |

22
swift/ql/test/library-tests/ast/PrintAst.expected
View File

@@ -88,7 +88,7 @@ cfg.swift:
# 19| getBase(): [TypeExpr] MyError.Type
# 19| getTypeRepr(): [TypeRepr] MyError
# 19| getMethodRef(): [DeclRefExpr] error1
# 19| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 19| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 21| getElement(1): [GuardStmt] guard ... else { ... }
# 21| getCondition(): [StmtCondition] StmtCondition
# 21| getElement(0): [ConditionElement] ... .<=(_:_:) ...
@@ -118,7 +118,7 @@ cfg.swift:
# 22| getExpr(): [DeclRefExpr] x
# 22| getArgument(1): [Argument] : 1
# 22| getExpr(): [IntegerLiteralExpr] 1
# 22| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 22| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 26| [NamedFunction] tryCatch(x:)
# 26| InterfaceType = (Int) -> Int
# 26| getParam(0): [ParamDecl] x
@@ -205,7 +205,7 @@ cfg.swift:
# 39| getPattern(): [NamedPattern] error
# 39| getPattern().getFullyUnresolved(): [BindingPattern] let ...
# 39| getVariable(0): [ConcreteVarDecl] error
# 39| Type = Error
# 39| Type = any Error
# 39| getBody(): [BraceStmt] { ... }
# 40| getElement(0): [CallExpr] call to print(_:separator:terminator:)
# 40| getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -3412,7 +3412,7 @@ cfg.swift:
# 564| getBody(): [BraceStmt] { ... }
# 564| getElement(0): [ReturnStmt] return
# 568| [NamedFunction] getMyProtocol()
# 568| InterfaceType = () -> MyProtocol
# 568| InterfaceType = () -> any MyProtocol
# 568| getBody(): [BraceStmt] { ... }
# 568| getElement(0): [ReturnStmt] return ...
# 568| getResult(): [CallExpr] call to MyProcotolImpl.init()
@@ -3420,7 +3420,7 @@ cfg.swift:
# 568| getBase(): [TypeExpr] MyProcotolImpl.Type
# 568| getTypeRepr(): [TypeRepr] MyProcotolImpl
# 568| getMethodRef(): [DeclRefExpr] MyProcotolImpl.init()
# 568| getResult().getFullyConverted(): [ErasureExpr] (MyProtocol) ...
# 568| getResult().getFullyConverted(): [ErasureExpr] (any MyProtocol) ...
# 569| [NamedFunction] getMyProtocolImpl()
# 569| InterfaceType = () -> MyProcotolImpl
# 569| getBody(): [BraceStmt] { ... }
@@ -3436,9 +3436,9 @@ cfg.swift:
# 571| Type = Int
# 571| getBody(): [BraceStmt] { ... }
# 573| [NamedFunction] testOpenExistentialExpr(x:y:)
# 573| InterfaceType = (MyProtocol, MyProcotolImpl) -> ()
# 573| InterfaceType = (any MyProtocol, MyProcotolImpl) -> ()
# 573| getParam(0): [ParamDecl] x
# 573| Type = MyProtocol
# 573| Type = any MyProtocol
# 573| getParam(1): [ParamDecl] y
# 573| Type = MyProcotolImpl
# 573| getBody(): [BraceStmt] { ... }
@@ -4816,7 +4816,7 @@ expressions.swift:
# 16| getBase(): [TypeExpr] AnError.Type
# 16| getTypeRepr(): [TypeRepr] AnError
# 16| getMethodRef(): [DeclRefExpr] failed
# 16| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 16| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 20| [TopLevelCodeDecl] { ... }
# 20| getBody(): [BraceStmt] { ... }
# 20| getElement(0): [ForceTryExpr] try! ...
@@ -6976,7 +6976,7 @@ statements.swift:
# 21| getPattern(): [NamedPattern] error
# 21| getPattern().getFullyUnresolved(): [BindingPattern] let ...
# 21| getVariable(0): [ConcreteVarDecl] error
# 21| Type = Error
# 21| Type = any Error
# 21| getBody(): [BraceStmt] { ... }
# 22| getElement(0): [CallExpr] call to print(_:separator:terminator:)
# 22| getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -7017,7 +7017,7 @@ statements.swift:
# 29| getPattern(): [NamedPattern] error
# 29| getPattern().getFullyUnresolved(): [BindingPattern] let ...
# 29| getVariable(0): [ConcreteVarDecl] error
# 29| Type = Error
# 29| Type = any Error
# 29| getBody(): [BraceStmt] { ... }
# 30| getElement(0): [CallExpr] call to print(_:separator:terminator:)
# 30| getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -7144,7 +7144,7 @@ statements.swift:
# 40| getBase(): [TypeExpr] AnError.Type
# 40| getTypeRepr(): [TypeRepr] AnError
# 40| getMethodRef(): [DeclRefExpr] failed
# 40| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 40| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 44| [TopLevelCodeDecl] { ... }
# 44| getBody(): [BraceStmt] { ... }
# 44| getElement(0): [DeferStmt] defer { ... }

6
swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected
View File

@@ -7,14 +7,14 @@
| nominaltype.swift:90:6:90:6 | b2 | B2 | getABaseType:A, getCanonicalType:B2, getFullName:B2, getName:B2, getUnderlyingType:B2 |
| nominaltype.swift:91:6:91:6 | b1_alias | B1_alias | getAliasedType:B1, getCanonicalType:B1, getFullName:B1_alias, getName:B1_alias, getUnderlyingType:B1 |
| nominaltype.swift:92:6:92:6 | b2_alias | B2_alias | getAliasedType:B2, getCanonicalType:B2, getFullName:B2_alias, getName:B2_alias, getUnderlyingType:B2 |
| nominaltype.swift:93:6:93:6 | p | P | getCanonicalType:P, getFullName:P, getName:P, getUnderlyingType:P |
| nominaltype.swift:94:6:94:6 | p_alias | P_alias | getCanonicalType:P, getFullName:P_alias, getName:P_alias, getUnderlyingType:P_alias |
| nominaltype.swift:93:6:93:6 | p | any P | getCanonicalType:any P, getFullName:any P, getName:any P, getUnderlyingType:any P |
| nominaltype.swift:94:6:94:6 | p_alias | any P_alias | getCanonicalType:any P, getFullName:any P_alias, getName:any P_alias, getUnderlyingType:any P_alias |
| nominaltype.swift:95:6:95:6 | c1 | C1 | getABaseType:P, getCanonicalType:C1, getFullName:C1, getName:C1, getUnderlyingType:C1 |
| nominaltype.swift:96:6:96:6 | c2 | C2 | getABaseType:P, getCanonicalType:C2, getFullName:C2, getName:C2, getUnderlyingType:C2 |
| nominaltype.swift:97:6:97:6 | o | Outer | getCanonicalType:Outer, getFullName:Outer, getName:Outer, getUnderlyingType:Outer |
| nominaltype.swift:98:6:98:6 | oi | Outer.Inner | getCanonicalType:Outer.Inner, getFullName:Outer.Inner, getName:Inner, getUnderlyingType:Outer.Inner |
| nominaltype.swift:99:6:99:6 | oia | Outer.Inner.InnerAlias | getAliasedType:A, getCanonicalType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias, getUnderlyingType:A |
| nominaltype.swift:100:6:100:6 | p1p2 | P1P2 | getCanonicalType:P1 & P2, getFullName:P1P2, getName:P1P2, getUnderlyingType:P1P2 |
| nominaltype.swift:100:6:100:6 | p1p2 | any P1P2 | getCanonicalType:any P1 & P2, getFullName:any P1P2, getName:any P1P2, getUnderlyingType:any P1P2 |
| nominaltype.swift:101:6:101:6 | boxInt | Box<A> | getCanonicalType:Box<A>, getFullName:Box<A>, getName:Box<A>, getUnderlyingType:Box<A> |
| nominaltype.swift:102:6:102:6 | d1 | D1 | getABaseType:P3, getCanonicalType:D1, getFullName:D1, getName:D1, getUnderlyingType:D1 |
| nominaltype.swift:103:6:103:6 | d2 | D2 | getABaseType:P4, getCanonicalType:D2, getFullName:D2, getName:D2, getUnderlyingType:D2 |