Merge pull request #494 from goblint/cil-c11-generic

michael-schwarz · web-flow · commit ed16687e75b6 · 2021-12-14T17:41:33.000+01:00
Bump goblint-cil to add C11 generic support
diff --git a/goblint.opam b/goblint.opam
@@ -58,7 +58,7 @@ dev-repo: "git+https://github.com/goblint/analyzer.git"
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
 # also remember to generate/adjust goblint.opam.locked!
 pin-depends: [
-  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#f3a075d0dab06c3b05ff31a34c02c3a4ec8ff8f9" ]
+  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#a6aa225b362e7bdd140810041901e5e2e85a436e" ]
   # TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
   [ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
   # quoter workaround reverted for release, so no pin needed
diff --git a/goblint.opam.locked b/goblint.opam.locked
@@ -94,7 +94,7 @@ version: "dev"
 pin-depends: [
   [
     "goblint-cil.1.8.2"
-    "git+https://github.com/goblint/cil.git#f3a075d0dab06c3b05ff31a34c02c3a4ec8ff8f9"
+    "git+https://github.com/goblint/cil.git#a6aa225b362e7bdd140810041901e5e2e85a436e"
   ]
   [
     "apron.v0.9.13"
diff --git a/goblint.opam.template b/goblint.opam.template
@@ -1,7 +1,7 @@
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
 # also remember to generate/adjust goblint.opam.locked!
 pin-depends: [
-  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#f3a075d0dab06c3b05ff31a34c02c3a4ec8ff8f9" ]
+  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#a6aa225b362e7bdd140810041901e5e2e85a436e" ]
   # TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
   [ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
   # quoter workaround reverted for release, so no pin needed
diff --git a/includes/stdlib.c b/includes/stdlib.c
@@ -30,8 +30,8 @@ void qsort(void *ptr, size_t count, size_t size, int (*comp)(const void*, const
 }
 
 
-void* bsearch(const void *key, void *ptr, size_t count, size_t size, int (*comp)(const void*, const void*))  __attribute__((goblint_stub));
-void* bsearch(const void *key, void *ptr, size_t count, size_t size, int (*comp)(const void*, const void*)) {
+void* bsearch(const void *key, const void *ptr, size_t count, size_t size, int (*comp)(const void*, const void*))  __attribute__((goblint_stub));
+void* bsearch(const void *key, const void *ptr, size_t count, size_t size, int (*comp)(const void*, const void*)) {
   // linear search for simplicity
   for (size_t i = 0; i < count; i++) {
     const void *a = ptr + i * size;

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ version: "dev"`
`94`	`94`	`pin-depends: [`
`95`	`95`	`[`
`96`	`96`	`"goblint-cil.1.8.2"`
`97`		`- "git+https://github.com/goblint/cil.git#f3a075d0dab06c3b05ff31a34c02c3a4ec8ff8f9"`
	`97`	`+ "git+https://github.com/goblint/cil.git#a6aa225b362e7bdd140810041901e5e2e85a436e"`
`98`	`98`	`]`
`99`	`99`	`[`
`100`	`100`	`"apron.v0.9.13"`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ void qsort(void ptr, size_t count, size_t size, int (comp)(const void*, const`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
`33`		`-void* bsearch(const void key, void ptr, size_t count, size_t size, int (comp)(const void, const void*)) __attribute__((goblint_stub));`
`34`		`-void* bsearch(const void key, void ptr, size_t count, size_t size, int (comp)(const void, const void*)) {`
	`33`	`+void* bsearch(const void key, const void ptr, size_t count, size_t size, int (comp)(const void, const void*)) __attribute__((goblint_stub));`
	`34`	`+void* bsearch(const void key, const void ptr, size_t count, size_t size, int (comp)(const void, const void*)) {`
`35`	`35`	`// linear search for simplicity`
`36`	`36`	`for (size_t i = 0; i < count; i++) {`
`37`	`37`	`const void a = ptr + i size;`