Address review.

Author: criemen

cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/ArrayLengthAnalysis.qll

@@ -39,10 +39,6 @@ private newtype TLength =
       or
       i instanceof CallInstruction
       or
-      i instanceof VariableAddressInstruction
-      or
-      i instanceof FieldAddressInstruction
-      or
       i.(LoadInstruction).getSourceAddress() instanceof VariableAddressInstruction
       or
       i.(LoadInstruction).getSourceAddress() instanceof FieldAddressInstruction
@@ -219,11 +215,11 @@ private predicate allocation(Instruction array, Length length, int delta) {
       (
         exists(Expr lengthExpr |
           deconstructMallocSizeExpr(alloc.getSizeExpr(), lengthExpr, delta) and
-          length.(VNLength).getInstruction().getUnconvertedResultExpression() = lengthExpr
+          length.(VNLength).getInstruction().getConvertedResultExpression() = lengthExpr
         )
         or
         not exists(int d | deconstructMallocSizeExpr(alloc.getSizeExpr(), _, d)) and
-        length.(VNLength).getInstruction().getUnconvertedResultExpression() = alloc.getSizeExpr() and
+        length.(VNLength).getInstruction().getConvertedResultExpression() = alloc.getSizeExpr() and
         delta = 0
       )
     )

cpp/ql/test/experimental/library-tests/rangeanalysis/arraylengthanalysis/ArrayLengthAnalysisTest.expected

@@ -1,17 +1,12 @@
 | test.cpp:15:8:15:11 | Load: aptr | VNLength(InitializeParameter: count) | 0 | ZeroOffset | 0 |
 | test.cpp:19:8:19:8 | Load: a | VNLength(Chi: ptr) | 0 | ZeroOffset | 0 |
-| test.cpp:19:8:19:8 | Load: a | VNLength(Convert: (unsigned long)...) | 0 | ZeroOffset | 0 |
 | test.cpp:21:8:21:8 | Load: a | VNLength(Chi: ptr) | -1 | ZeroOffset | 0 |
 | test.cpp:23:8:23:8 | Load: a | VNLength(Chi: ptr) | 1 | ZeroOffset | 0 |
 | test.cpp:27:8:27:8 | Load: c | VNLength(Chi: ptr) | 0 | ZeroOffset | 0 |
-| test.cpp:27:8:27:8 | Load: c | VNLength(Convert: (unsigned long)...) | 0 | ZeroOffset | 0 |
 | test.cpp:28:8:28:24 | Convert: (unsigned char *)... | VNLength(Chi: ptr) | 0 | ZeroOffset | 0 |
-| test.cpp:28:8:28:24 | Convert: (unsigned char *)... | VNLength(Convert: (unsigned long)...) | 0 | ZeroOffset | 0 |
 | test.cpp:30:8:30:8 | Load: v | VNLength(Chi: ptr) | 0 | ZeroOffset | 0 |
-| test.cpp:30:8:30:8 | Load: v | VNLength(Convert: (unsigned long)...) | 0 | ZeroOffset | 0 |
 | test.cpp:34:8:34:12 | Convert: array to pointer conversion | ZeroLength | 100 | ZeroOffset | 0 |
 | test.cpp:37:10:37:10 | Load: b | VNLength(Chi: ptr) | 0 | ZeroOffset | 0 |
-| test.cpp:37:10:37:10 | Load: b | VNLength(Convert: (unsigned long)...) | 0 | ZeroOffset | 0 |
 | test.cpp:44:8:44:8 | Load: a | VNLength(InitializeParameter: count) | 0 | ZeroOffset | 2 |
 | test.cpp:53:10:53:10 | Load: a | VNLength(InitializeParameter: count) | 0 | ZeroOffset | 2 |
 | test.cpp:56:10:56:10 | Load: a | VNLength(InitializeParameter: count) | 0 | ZeroOffset | 3 |