Try to replace pointr derefs with variables also in query

Author: michael-schwarz

src/analyses/apron/apronAnalysis.apron.ml

@@ -425,9 +425,10 @@ struct
     let open Queries in
     let st = ctx.local in
     let eval_int e =
+      let esimple = replace_deref_exps ctx.ask e in
       read_from_globals_wrapper
         (Analyses.ask_of_ctx ctx)
-        ctx.global st e
+        ctx.global st esimple
         (fun apr' e' -> AD.eval_int apr' e')
     in
     match q with

tests/regression/46-apron2/16-rel-offset.c

@@ -0,0 +1,27 @@
+// SKIP PARAM: --set solver td3 --set ana.activated "['base','threadid','threadflag','mallocWrapper','apron','escape']" --set ana.path_sens[+] threadflag --set ana.base.privatization none --set ana.apron.privatization mutex-meet-tid --set ana.base.arrays.domain partitioned
+#include <pthread.h>
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+
+
+int main(){
+    int arr[] = {2, 4};
+
+    int x,y;
+
+    int* ptr = &y;
+    x = y;
+
+    int z = *ptr == x;
+    assert(x==y);
+    assert(z == 1);
+    assert(*ptr == x);
+    assert(*ptr == y);
+    assert(y == y);
+
+    assert(arr[*ptr == x] == 4);
+
+
+    return 0;
+}