4 files changed, 58 insertions, 11 deletions
diff --git a/test-suite/bugs/closed/3424.v b/test-suite/bugs/opened/3424.v
index ee8cabf171..d1c5bb68f9 100644
--- a/test-suite/bugs/closed/3424.v
+++ b/test-suite/bugs/opened/3424.v
@@ -13,12 +13,12 @@ Notation "0" := (trunc_S minus_one) : trunc_scope.
 Class IsTrunc (n : trunc_index) (A : Type) : Type := Trunc_is_trunc : IsTrunc_internal n A.
 Notation IsHProp := (IsTrunc minus_one).
 Notation IsHSet := (IsTrunc 0).
-Set Refolding Reduction.
 Goal forall (A : Type) (a b : A) (H' : IsHSet A), { x : Type & IsHProp x }.
 Proof.
 intros.
 eexists.
 (* exact (H' a b). *)
 (* Undo. *)
-apply (H' a b).
+Fail apply (H' a b).
+exact (H' a b).
 Qed.
diff --git a/test-suite/output/inference.out b/test-suite/output/inference.out
index 5e9eff0481..f7ffd1959a 100644
--- a/test-suite/output/inference.out
+++ b/test-suite/output/inference.out
@@ -4,8 +4,6 @@ fun e : option L => match e with
                     | None => None
                     end
      : option L -> option L
-fun (m n p : nat) (H : S m <= S n + p) => le_S_n m (n + p) H
-     : forall m n p : nat, S m <= S n + p -> m <= n + p
 fun n : nat => let y : T n := A n in ?t ?x : T n
      : forall n : nat, T n
 where
diff --git a/test-suite/output/inference.v b/test-suite/output/inference.v
index 73169dae65..57a4739e9f 100644
--- a/test-suite/output/inference.v
+++ b/test-suite/output/inference.v
@@ -13,12 +13,6 @@ Definition P (e:option L) :=
 
 Print P.
 
-(* Check that plus is folded even if reduction is involved *)
-Set Warnings Append "-deprecated-option".
-Set Refolding Reduction.
-Check (fun m n p (H : S m <= (S n) + p) => le_S_n _ _ H).
-
-
 (* Check that the heuristic to solve constraints is not artificially
    dependent on the presence of a let-in, and in particular that the
    second [_] below is not inferred to be n, as if obtained by
diff --git a/test-suite/success/coercions.v b/test-suite/success/coercions.v
index 9b11bc011c..9389c9d32e 100644
--- a/test-suite/success/coercions.v
+++ b/test-suite/success/coercions.v
@@ -130,4 +130,59 @@ Local Coercion l2v2 : list >-> vect.
    of coercions *)
 Fail Check (fun l : list (T1 * T1) => (l : vect _ _)).
 Check (fun l : list (T1 * T1) => (l2v2 l : vect _ _)).
-Section what_we_could_do.
+End what_we_could_do.
+
+
+(** Unit test for Prop as source class *)
+
+Module TestPropAsSourceCoercion.
+
+  Parameter heap : Prop.
+
+  Parameter heap_empty : heap.
+
+  Definition hprop := heap -> Prop.
+
+  Coercion hpure (P:Prop) : hprop := fun h => h = heap_empty /\ P.
+
+  Parameter heap_single : nat -> nat -> hprop.
+
+  Parameter hstar : hprop -> hprop -> hprop.
+
+  Notation "H1 \* H2" := (hstar H1 H2) (at level 69).
+
+  Definition test := heap_single 4 5 \* (5 <> 4) \* heap_single 2 4 \* (True).
+
+  (* Print test. -- reveals [hpure] coercions *)
+
+End TestPropAsSourceCoercion.
+
+
+(** Unit test for Type as source class *)
+
+Module TestTypeAsSourceCoercion.
+
+  Require Import Coq.Setoids.Setoid.
+
+  Record setoid := { A : Type ; R : relation A ; eqv : Equivalence R }.
+
+  Definition default_setoid (T : Type) : setoid
+    := {| A := T ; R := eq ; eqv := _ |}.
+
+  Coercion default_setoid : Sortclass >-> setoid.
+
+  Definition foo := Type : setoid.
+
+  Inductive type := U | Nat.
+  Inductive term : type -> Type :=
+  | ty (_ : Type) : term U
+  | nv (_ : nat) : term Nat.
+
+  Coercion ty : Sortclass >-> term.
+
+  Definition ty1 := Type : term _.
+  Definition ty2 := Prop : term _.
+  Definition ty3 := Set : term _.
+  Definition ty4 := (Type : Type) : term _.
+
+End TestTypeAsSourceCoercion.