Swift: Run codegen

swift/ql/.generated.list

@@ -737,10 +737,10 @@ lib/codeql/swift/generated/KeyPathComponent.qll e11dcf952045b5e6062e24c23515cff9
 lib/codeql/swift/generated/Locatable.qll 1d37fa20de71c0b9986bfd7a7c0cb82ab7bf3fda2d2008700f955ad82ce109a7 e97d4d4fb8a4800e0008cc00f60c8ed9b1ebd5f1140fd85e68b034616178d721
 lib/codeql/swift/generated/Location.qll 5e20316c3e480ddfe632b7e88e016c19f10a67df1f6ae9c8f128755a6907d6f5 5a0af2d070bcb2ed53d6d0282bf9c60dc64c2dce89c21fdd485e9c7893c1c8fa
 lib/codeql/swift/generated/MacroRole.qll facf907e75490d69cd401c491215e4719324d751f40ea46c86ccf24cf3663c1f 969d8d4b44e3f1a9c193a152a4d83a303e56d2dbb871fc920c47a33f699cf018
-lib/codeql/swift/generated/ParentChild.qll 4d697f5372ad82380dc375a59fa0619ee56c7d88be58530147cd8e160262bbe3 e164b712a41f20d0b9986804cd753fb5e55ceb55139234d98bdb332a8f248db4
+lib/codeql/swift/generated/ParentChild.qll 7fdc133bdec6cc223d5ee85e757b02c5d2e1ab121bcf269bb48c8a12a31a61e9 d8dd6e21d290a293db4db510b1523a9ea428b12f48b7574f03acf00b9ca065ef
 lib/codeql/swift/generated/PureSynthConstructors.qll bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4 bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4
-lib/codeql/swift/generated/Raw.qll f7dd5c3eb1afba1077dd6c291502e2b5dd5d18000ee581f7e3ad4f0050165c69 f042929df4651dfe587769cd3f539d07f97328c2fe17fbe19cbb8e4fbefe97f2
+lib/codeql/swift/generated/Raw.qll 6adc2ec210e91051b6d3d6c84117b827f10dbea682a18b69348d1c6cdc53629c 9ff02fcca7a7b83c85303ffc6daa00ea392da6ce1f9cb389b5053b34d4a45e4c
-lib/codeql/swift/generated/Synth.qll 6af0f5778c6c6a9d9a518c00707501c3fdb3ccaa96fa06793549c2b1f28c9cbb 575829e7a2a4c7619c6d98f1b7ec47d978d0b3d77d5c1a87eae5e9f98612ef5b
+lib/codeql/swift/generated/Synth.qll b0084d1f573ba1b10ec8a8fab169b15f15866ecb9a6aeeeac81553a442be28e3 09efe455f3fd6b8b983b30efbd797f09af46e6f5a1a1075801650528999ed938
 lib/codeql/swift/generated/SynthConstructors.qll c40f01e1331bdbe238620a41d17409cefe34a6b23066708ef5d74f8631b54f48 c40f01e1331bdbe238620a41d17409cefe34a6b23066708ef5d74f8631b54f48
 lib/codeql/swift/generated/UnknownFile.qll 247ddf2ebb49ce5ed4bf7bf91a969ddff37de6c78d43d8affccaf7eb586e06f2 452b29f0465ef45e978ef8b647b75e5a2a1e53f2a568fc003bc8f52f73b3fa4d
 lib/codeql/swift/generated/UnknownLocation.qll d871000b4f53ffca4f67ea23ca5626e5dcce125d62a4d4b9969e08cc974af6fc b05971d7774e60790362fb810fb7086314f40a2de747b8cb1bc823ec6494a4dd

swift/ql/lib/codeql/swift/generated/ParentChild.qll

@@ -45,7 +45,7 @@ private module Impl {
   ) {
     exists(int n, int nSpec |
       n = 0 and
-      nSpec = n + 1 + max(int i | i = -1 or exists(e.getSpec(i)) | i) and
+      nSpec = n + e.getNumberOfSpecs() and
       (
         none()
         or
@@ -66,7 +66,7 @@ private module Impl {
   ) {
     exists(int n, int nSubscriptArgument |
       n = 0 and
-      nSubscriptArgument = n + 1 + max(int i | i = -1 or exists(e.getSubscriptArgument(i)) | i) and
+      nSubscriptArgument = n + e.getNumberOfSubscriptArguments() and
       (
         none()
         or
@@ -100,7 +100,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -115,7 +115,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -130,8 +130,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -149,7 +149,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -162,7 +162,7 @@ private module Impl {
   private Element getImmediateChildOfImportDecl(ImportDecl e, int index, string partialPredicateCall) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -177,7 +177,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -192,7 +192,7 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nInit, int nPattern |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       nInit = nMember + 1 + max(int i | i = -1 or exists(e.getImmediateInit(i)) | i) and
       nPattern = nInit + 1 + max(int i | i = -1 or exists(e.getImmediatePattern(i)) | i) and
       (
@@ -215,7 +215,7 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nMessage |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       nMessage = nMember + 1 and
       (
         none()
@@ -233,7 +233,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -248,7 +248,7 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nBody |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       nBody = nMember + 1 and
       (
         none()
@@ -264,7 +264,7 @@ private module Impl {
   private Element getImmediateChildOfUsingDecl(UsingDecl e, int index, string partialPredicateCall) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -279,8 +279,8 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nParam |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
-      nParam = nMember + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nMember + e.getNumberOfParams() and
       (
         none()
         or
@@ -298,7 +298,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -311,8 +311,8 @@ private module Impl {
   private Element getImmediateChildOfMacroDecl(MacroDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -330,7 +330,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -345,7 +345,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -362,12 +362,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -397,12 +397,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -428,7 +428,7 @@ private module Impl {
   private Element getImmediateChildOfModuleDecl(ModuleDecl e, int index, string partialPredicateCall) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -443,11 +443,10 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nAccessor, int nGenericTypeParam, int nParam |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
-      nAccessor = nMember + 1 + max(int i | i = -1 or exists(e.getAccessor(i)) | i) and
+      nAccessor = nMember + e.getNumberOfAccessors() and
-      nGenericTypeParam =
+      nGenericTypeParam = nAccessor + e.getNumberOfGenericTypeParams() and
-        nAccessor + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nParam = nGenericTypeParam + e.getNumberOfParams() and
-      nParam = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
       (
         none()
         or
@@ -471,12 +470,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -504,7 +503,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -523,8 +522,8 @@ private module Impl {
       int nPropertyWrapperProjectionVar
     |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
-      nAccessor = nMember + 1 + max(int i | i = -1 or exists(e.getAccessor(i)) | i) and
+      nAccessor = nMember + e.getNumberOfAccessors() and
       nPropertyWrapperBackingVarBinding = nAccessor + 1 and
       nPropertyWrapperBackingVar = nPropertyWrapperBackingVarBinding + 1 and
       nPropertyWrapperProjectionVarBinding = nPropertyWrapperBackingVar + 1 and
@@ -562,7 +561,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -579,12 +578,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -612,8 +611,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -634,8 +633,8 @@ private module Impl {
       int nPropertyWrapperLocalWrappedVar
     |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
-      nAccessor = nMember + 1 + max(int i | i = -1 or exists(e.getAccessor(i)) | i) and
+      nAccessor = nMember + e.getNumberOfAccessors() and
       nPropertyWrapperBackingVarBinding = nAccessor + 1 and
       nPropertyWrapperBackingVar = nPropertyWrapperBackingVarBinding + 1 and
       nPropertyWrapperProjectionVarBinding = nPropertyWrapperBackingVar + 1 and
@@ -683,8 +682,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -700,8 +699,8 @@ private module Impl {
   private Element getImmediateChildOfClassDecl(ClassDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -717,8 +716,8 @@ private module Impl {
   private Element getImmediateChildOfEnumDecl(EnumDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -736,8 +735,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -753,8 +752,8 @@ private module Impl {
   private Element getImmediateChildOfStructDecl(StructDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -827,8 +826,8 @@ private module Impl {
   ) {
     exists(int n, int nBindingDecl, int nVariable, int nClosureBody |
       n = 0 and
-      nBindingDecl = n + 1 + max(int i | i = -1 or exists(e.getBindingDecl(i)) | i) and
+      nBindingDecl = n + e.getNumberOfBindingDecls() and
-      nVariable = nBindingDecl + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nVariable = nBindingDecl + e.getNumberOfVariables() and
       nClosureBody = nVariable + 1 and
       (
         none()
@@ -1040,7 +1039,7 @@ private module Impl {
     exists(int n, int nRoot, int nComponent |
       n = 0 and
       nRoot = n + 1 and
-      nComponent = nRoot + 1 + max(int i | i = -1 or exists(e.getComponent(i)) | i) and
+      nComponent = nRoot + e.getNumberOfComponents() and
       (
         none()
         or
@@ -1493,9 +1492,9 @@ private module Impl {
     exists(int n, int nSelfParam, int nParam, int nBody, int nCapture |
       n = 0 and
       nSelfParam = n + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -1528,7 +1527,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -1584,7 +1583,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -1797,9 +1796,9 @@ private module Impl {
     exists(int n, int nSelfParam, int nParam, int nBody, int nCapture |
       n = 0 and
       nSelfParam = n + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -2014,7 +2013,7 @@ private module Impl {
   ) {
     exists(int n, int nArgument |
       n = 0 and
-      nArgument = n + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = n + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2070,7 +2069,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2088,7 +2087,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2140,7 +2139,7 @@ private module Impl {
     exists(int n, int nBase, int nArgument |
       n = 0 and
       nBase = n + 1 and
-      nArgument = nBase + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nBase + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2286,7 +2285,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2346,7 +2345,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2578,7 +2577,7 @@ private module Impl {
   ) {
     exists(int n, int nElement |
       n = 0 and
-      nElement = n + 1 + max(int i | i = -1 or exists(e.getElement(i)) | i) and
+      nElement = n + e.getNumberOfElements() and
       (
         none()
         or
@@ -2591,7 +2590,7 @@ private module Impl {
   private Element getImmediateChildOfBraceStmt(BraceStmt e, int index, string partialPredicateCall) {
     exists(int n, int nVariable, int nElement |
       n = 0 and
-      nVariable = n + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nVariable = n + e.getNumberOfVariables() and
       nElement = nVariable + 1 + max(int i | i = -1 or exists(e.getImmediateElement(i)) | i) and
       (
         none()
@@ -2612,8 +2611,8 @@ private module Impl {
   private Element getImmediateChildOfCaseStmt(CaseStmt e, int index, string partialPredicateCall) {
     exists(int n, int nLabel, int nVariable, int nBody |
       n = 0 and
-      nLabel = n + 1 + max(int i | i = -1 or exists(e.getLabel(i)) | i) and
+      nLabel = n + e.getNumberOfLabels() and
-      nVariable = nLabel + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nVariable = nLabel + e.getNumberOfVariables() and
       nBody = nVariable + 1 and
       (
         none()
@@ -2732,7 +2731,7 @@ private module Impl {
     exists(int n, int nBody, int nCatch |
       n = 0 and
       nBody = n + 1 and
-      nCatch = nBody + 1 + max(int i | i = -1 or exists(e.getCatch(i)) | i) and
+      nCatch = nBody + e.getNumberOfCatches() and
       (
         none()
         or
@@ -2763,7 +2762,7 @@ private module Impl {
       int n, int nVariable, int nPattern, int nWhere, int nIteratorVar, int nNextCall, int nBody
     |
       n = 0 and
-      nVariable = n + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nVariable = n + e.getNumberOfVariables() and
       nPattern = nVariable + 1 and
       nWhere = nPattern + 1 and
       nIteratorVar = nWhere + 1 and
@@ -2813,7 +2812,7 @@ private module Impl {
     exists(int n, int nExpr, int nCase |
       n = 0 and
       nExpr = n + 1 and
-      nCase = nExpr + 1 + max(int i | i = -1 or exists(e.getCase(i)) | i) and
+      nCase = nExpr + e.getNumberOfCases() and
       (
         none()
         or