Update indexing logic

AndreiDiaconu1 · AndreiDiaconu1 · commit 3a83dc54aa2d · 2019-09-19T10:31:25.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedElement.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -26,15 +26,15 @@ ArrayType getArrayOfDim(int dim, Type type) {
 }
 
 private predicate canCreateCompilerGeneratedElement(Element generatedBy, int nth) {
-  generatedBy instanceof ForeachStmt and nth in [0 .. ForeachElements::noGeneratedElements()]
+  generatedBy instanceof ForeachStmt and nth in [0 .. ForeachElements::noGeneratedElements() - 1]
   or
-  generatedBy instanceof LockStmt and nth in [0 .. LockElements::noGeneratedElements()]
+  generatedBy instanceof LockStmt and nth in [0 .. LockElements::noGeneratedElements() - 1]
   or
   generatedBy instanceof DelegateCreation and
-  nth in [0 .. DelegateElements::noGeneratedElements(generatedBy)]
+  nth in [0 .. DelegateElements::noGeneratedElements(generatedBy) - 1]
   or
   generatedBy instanceof DelegateCall and
-  nth in [0 .. DelegateElements::noGeneratedElements(generatedBy)]
+  nth in [0 .. DelegateElements::noGeneratedElements(generatedBy) - 1]
 }
 
 /**
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/desugar/Delegate.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/desugar/Delegate.qll
@@ -33,9 +33,11 @@ module DelegateElements {
   TranslatedDelegateInvokeCall getInvoke(DelegateCall generatedBy) { result.getAST() = generatedBy }
 
   int noGeneratedElements(Element generatedBy) {
-    generatedBy instanceof DelegateCreation and result = 1
-    or
-    generatedBy instanceof DelegateCall and result = 1
+    (
+      generatedBy instanceof DelegateCreation or
+      generatedBy instanceof DelegateCall
+    ) and
+    result = 2
   }
 }
 
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/desugar/Foreach.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/desugar/Foreach.qll
@@ -59,7 +59,7 @@ module ForeachElements {
 
   TranslatedForeachEnumerator getEnumDecl(ForeachStmt generatedBy) { result.getAST() = generatedBy }
 
-  int noGeneratedElements() { result = 12 }
+  int noGeneratedElements() { result = 13 }
 }
 
 private class TranslatedForeachTry extends TranslatedCompilerGeneratedTry,
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/desugar/Lock.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/desugar/Lock.qll
@@ -49,7 +49,7 @@ module LockElements {
     result.getAST() = generatedBy
   }
 
-  int noGeneratedElements() { result = 13 }
+  int noGeneratedElements() { result = 14 }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,11 @@ module DelegateElements {`
`33`	`33`	`TranslatedDelegateInvokeCall getInvoke(DelegateCall generatedBy) { result.getAST() = generatedBy }`
`34`	`34`
`35`	`35`	`int noGeneratedElements(Element generatedBy) {`
`36`		`- generatedBy instanceof DelegateCreation and result = 1`
`37`		`- or`
`38`		`- generatedBy instanceof DelegateCall and result = 1`
	`36`	`+ (`
	`37`	`+ generatedBy instanceof DelegateCreation or`
	`38`	`+ generatedBy instanceof DelegateCall`
	`39`	`+ ) and`
	`40`	`+ result = 2`
`39`	`41`	`}`
`40`	`42`	`}`
`41`	`43`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ module ForeachElements {`
`59`	`59`
`60`	`60`	`TranslatedForeachEnumerator getEnumDecl(ForeachStmt generatedBy) { result.getAST() = generatedBy }`
`61`	`61`
`62`		`- int noGeneratedElements() { result = 12 }`
	`62`	`+ int noGeneratedElements() { result = 13 }`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`private class TranslatedForeachTry extends TranslatedCompilerGeneratedTry,`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ module LockElements {`
`49`	`49`	`result.getAST() = generatedBy`
`50`	`50`	`}`
`51`	`51`
`52`		`- int noGeneratedElements() { result = 13 }`
	`52`	`+ int noGeneratedElements() { result = 14 }`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`