6 files changed, 119 insertions, 3 deletions
diff --git a/test-suite/bugs/closed/bug_11811.v b/test-suite/bugs/closed/bug_11811.v
new file mode 100644
index 0000000000..a73494b630
--- /dev/null
+++ b/test-suite/bugs/closed/bug_11811.v
@@ -0,0 +1,13 @@
+
+Unset Positivity Checking.
+
+Inductive foo : Type -> Type :=
+| bar : foo (foo unit)
+| baz : foo nat.
+
+Definition toto : forall A, foo A -> {A = foo unit} + {A = nat}.
+Proof.
+  intros A x. destruct x; intuition.
+Defined.
+
+Check (eq_refl : toto _ baz = right eq_refl).
diff --git a/test-suite/bugs/closed/bug_9058.v b/test-suite/bugs/closed/bug_9058.v
new file mode 100644
index 0000000000..6de8324641
--- /dev/null
+++ b/test-suite/bugs/closed/bug_9058.v
@@ -0,0 +1,16 @@
+Class A (X : Type) := {}.
+Hint Mode A ! : typeclass_instances.
+
+Class B X {aX: A X} Y := { opB: X -> Y -> Y }.
+Hint Mode B - - ! : typeclass_instances.
+
+Section Section.
+
+Context X {aX: A X} Y {bY: B X Y}.
+
+(* Set Typeclasses Debug. *)
+
+Let ok := fun (x : X) (y : Y) => opB x y.
+Let ok' := fun x (y : Y) => opB x y.
+
+End Section.
diff --git a/test-suite/coq-makefile/camldep/run.sh b/test-suite/coq-makefile/camldep/run.sh
index aa62ee56eb..465677a4bf 100755
--- a/test-suite/coq-makefile/camldep/run.sh
+++ b/test-suite/coq-makefile/camldep/run.sh
@@ -13,5 +13,9 @@ mkdir src
 echo '{ let foo = () }' > src/file1.mlg
 echo 'let bar = File1.foo' > src/file2.ml
 coq_makefile -f _CoqProject -o Makefile
-make src/file2.cmx
-[ -f src/file2.cmx ]
+if which ocamlopt >/dev/null 2>&1; then
+    make src/file2.cmx
+    [ -f src/file2.cmx ]
+fi
+make src/file2.cmo
+[ -f src/file2.cmo ]
diff --git a/test-suite/coq-makefile/findlib-package-unpacked/run.sh b/test-suite/coq-makefile/findlib-package-unpacked/run.sh
index e53a7ed0f7..6d7ae15ee2 100755
--- a/test-suite/coq-makefile/findlib-package-unpacked/run.sh
+++ b/test-suite/coq-makefile/findlib-package-unpacked/run.sh
@@ -16,5 +16,7 @@ coq_makefile -f _CoqProject -o Makefile
 cat Makefile.conf
 cat Makefile.local
 make -C findlib/foo
-make
+if which ocamlopt >/dev/null 2>&1; then
+    make
+fi
 make byte
diff --git a/test-suite/success/HintMode.v b/test-suite/success/HintMode.v
new file mode 100644
index 0000000000..decddb73d1
--- /dev/null
+++ b/test-suite/success/HintMode.v
@@ -0,0 +1,20 @@
+Module Postponing.
+
+Class In A T := { IsIn : A -> T -> Prop }.
+Class Empty T := { empty : T }.
+Class EmptyIn (A T : Type) `{In A T} `{Empty T} :=
+ { isempty : forall x, IsIn x empty -> False }.
+
+Hint Mode EmptyIn ! ! - - : typeclass_instances.
+Hint Mode Empty ! : typeclass_instances.
+Hint Mode In ! - : typeclass_instances.
+Existing Class IsIn.
+Goal forall A T `{In A T} `{Empty T} `{EmptyIn A T}, forall x : A, IsIn x empty -> False.
+ Proof.
+   intros.
+   eapply @isempty. (* Second goal needs to be solved first, to un-stuck the first one
+   (hence the Existing Class IsIn to allow finding the assumption of IsIn here)  *)
+   all:typeclasses eauto.
+Qed.
+
+End Postponing.
diff --git a/test-suite/success/Typeclasses.v b/test-suite/success/Typeclasses.v
index 3f96bf2c35..66305dfefa 100644
--- a/test-suite/success/Typeclasses.v
+++ b/test-suite/success/Typeclasses.v
@@ -1,3 +1,64 @@
+Module applydestruct.
+  Class Foo (A : Type) :=
+    { bar : nat -> A;
+      baz  : A -> nat }.
+  Hint Mode Foo + : typeclass_instances.
+
+  Class C (A : Type).
+  Hint Mode C + : typeclass_instances.
+
+  Variable fool : forall {A} {F : Foo A} (x : A), C A -> bar 0 = x.
+  (* apply leaves non-dependent subgoals of typeclass type
+     alone *)
+  Goal forall {A} {F : Foo A} (x : A), bar 0 = x.
+  Proof.
+    intros. apply fool.
+    match goal with
+      |[ |- C A ] => idtac
+    end.
+  Abort.
+
+  Variable fooli : forall {A} {F : Foo A} {c : C A} (x : A), bar 0 = x.
+  (* apply tries to resolve implicit argument typeclass
+     constraints. *)
+  Goal forall {A} {F : Foo A} (x : A), bar 0 = x.
+  Proof.
+    intros.
+    Fail apply fooli.
+    Fail unshelve eapply fooli; solve [typeclasses eauto].
+    eapply fooli.
+  Abort.
+
+  (* It applies resolution after unification of the goal *)
+  Goal forall {A} {F : Foo A} {C : C A} (x : A), bar 0 = x.
+  Proof.
+    intros. apply fooli.
+  Abort.
+    Set Typeclasses Debug Verbosity 2.
+
+  Inductive bazdestr {A} (F : Foo A) : nat -> Prop :=
+    | isbas : bazdestr F 1.
+
+  Variable fooinv : forall {A} {F : Foo A} (x : A),
+      bazdestr F (baz x).
+
+  (* Destruct applies resolution early, before finding
+     occurrences to abstract. *)
+  Goal forall {A} {F : Foo A} {C : C A} (x : A), baz x = 0.
+  Proof.
+    intros. Fail destruct (fooinv _).
+    destruct (fooinv x).
+  Abort.
+
+  Goal forall {A} {F : Foo A} (x y : A), x = y.
+  Proof.
+    intros. rewrite <- (fool x). rewrite <- (fool y). reflexivity.
+    match goal with
+      |[ |- C A ] => idtac
+    end.
+  Abort.
+End applydestruct.
+
 Module onlyclasses.
 
 (* In 8.6 we still allow non-class subgoals *)