Merge branch 'ci/ralf/name-mangling' into 'master'

Make Iris compatible with name mangling

Closes #343

See merge request !647

.gitlab-ci.yml

@@ -31,6 +31,7 @@ build-coq.dev:
   <<: *template
   variables:
     OPAM_PINS: "coq version dev"
+    MANGLE_NAMES: "1"
 
 build-coq.8.13.1:
   <<: *template

iris/proofmode/ltac_tactics.v

@@ -2948,13 +2948,13 @@ Tactic Notation "iInvCore" constr(select) "with" constr(pats) "as" open_constr(H
     end in
   lazymatch type of select with
   | string =>
-     eapply @tac_inv_elim with (i:=select) (j:=H) (Pclose:=Pclose_pat);
+     notypeclasses refine (tac_inv_elim _ select H _ _ _ _ _ Pclose_pat _ _ _ _ _ _);
      [ (by iAssumptionCore) || fail "iInv: invariant" select "not found" |..]
   | ident  =>
-     eapply @tac_inv_elim with (i:=select) (j:=H) (Pclose:=Pclose_pat);
+     notypeclasses refine (tac_inv_elim _ select H _ _ _ _ _ Pclose_pat _ _ _ _ _ _);
      [ (by iAssumptionCore) || fail "iInv: invariant" select "not found" |..]
   | namespace =>
-     eapply @tac_inv_elim with (j:=H) (Pclose:=Pclose_pat);
+     notypeclasses refine (tac_inv_elim _ _ H _ _ _ _ _ Pclose_pat _ _ _ _ _ _);
      [ (by iAssumptionInv select) || fail "iInv: invariant" select "not found" |..]
   | _ => fail "iInv: selector" select "is not of the right type "
   end;

tests/atomic.v

@@ -3,6 +3,8 @@ From iris.program_logic Require Export atomic.
 From iris.heap_lang Require Import proofmode notation atomic_heap.
 Set Default Proof Using "Type".
 
+Unset Mangle Names.
+
 Section tests.
   Context `{!heapG Σ} {aheap: atomic_heap Σ}.
   Import atomic_heap.notation.

tests/heap_lang.v

@@ -5,6 +5,8 @@ From iris.heap_lang Require Import lang adequacy proofmode notation.
 From iris.heap_lang Require Import lang.
 Set Default Proof Using "Type".
 
+Unset Mangle Names.
+
 Section tests.
   Context `{!heapG Σ}.
   Implicit Types P Q : iProp Σ.

tests/heap_lang2.v

@@ -5,6 +5,8 @@ From iris.heap_lang Require Export primitive_laws notation.
 From iris.heap_lang Require Import proofmode notation.
 Set Default Proof Using "Type".
 
+Unset Mangle Names.
+
 Section printing_tests.
   Context `{!heapG Σ}.
 

tests/ipm_paper.v

@@ -9,6 +9,8 @@ From iris.deprecated.program_logic Require Import hoare.
 From iris.heap_lang Require Import proofmode notation.
 Set Default Proof Using "Type".
 
+Unset Mangle Names.
+
 (** The proofs from Section 3.1 *)
 Section demo.
   Context {M : ucmra}.

tests/list_reverse.v

@@ -5,6 +5,8 @@ From iris.heap_lang Require Export lang.
 From iris.heap_lang Require Import proofmode notation.
 Set Default Proof Using "Type".
 
+Unset Mangle Names.
+
 Section list_reverse.
 Context `{!heapG Σ}.
 Implicit Types l : loc.

tests/mosel_paper.v

@@ -8,6 +8,8 @@ ICFP 2018 *)
 From iris.bi Require Import monpred.
 From iris.proofmode Require Import tactics monpred.
 
+Unset Mangle Names.
+
 Lemma example_1 {PROP : bi} {A : Type} (P : PROP) (Φ Ψ : A → PROP) :
   P ∗ (∃ a, Φ a ∨ Ψ a) -∗ ∃ a, (P ∗ Φ a) ∨ (P ∗ Ψ a).
 Proof.

tests/one_shot.v

@@ -10,6 +10,8 @@ Set Default Proof Using "Type".
 (** This is the introductory example from the "Iris from the Ground Up" journal
 paper. *)
 
+Unset Mangle Names.
+
 Definition one_shot_example : val := λ: <>,
   let: "x" := ref NONE in (
   (* tryset *) (λ: "n",

tests/one_shot_once.v

@@ -10,6 +10,8 @@ Set Default Proof Using "Type".
 (** This is the introductory example from Ralf's PhD thesis.
 The difference to [one_shot] is that [set] asserts to be called only once. *)
 
+Unset Mangle Names.
+
 Definition one_shot_example : val := λ: <>,
   let: "x" := ref NONE in (
   (* set *) (λ: "n",

tests/proofmode.v

 From iris.proofmode Require Import tactics intro_patterns.
 Set Default Proof Using "Type".
 
+Unset Mangle Names.
+
 Section tests.
 Context {PROP : bi}.
 Implicit Types P Q R : PROP.

tests/proofmode_ascii.v

@@ -5,6 +5,7 @@ From iris.base_logic.lib Require Import invariants cancelable_invariants na_inva
 From iris.bi Require Import ascii.
 
 Set Default Proof Using "Type".
+Unset Mangle Names.
 
 (* Remove this and the [Set Printing Raw Literals.] below once we require Coq
 8.14. *)

tests/proofmode_iris.v

@@ -3,6 +3,8 @@ From iris.proofmode Require Import tactics monpred.
 From iris.base_logic Require Import base_logic.
 From iris.base_logic.lib Require Import invariants cancelable_invariants na_invariants.
 
+Unset Mangle Names.
+
 Section base_logic_tests.
   Context {M : ucmra}.
   Implicit Types P Q R : uPred M.

tests/proofmode_monpred.v

 From iris.proofmode Require Import tactics monpred.
 From iris.base_logic.lib Require Import invariants.
 
+Unset Mangle Names.
+
 Section tests.
   Context {I : biIndex} {PROP : bi}.
   Local Notation monPred := (monPred I PROP).

tests/telescopes.v

@@ -2,6 +2,8 @@ From stdpp Require Import coPset namespaces.
 From iris.proofmode Require Import tactics.
 Set Default Proof Using "Type".
 
+Unset Mangle Names.
+
 Section basic_tests.
   Context {PROP : bi}.
   Implicit Types P Q R : PROP.