From 300293c119981054c95182a90c829058530a6b6f Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sun, 25 Dec 2011 13:19:42 +0100
Subject: Imported Upstream version 8.3.pl3

---
 kernel/mod_subst.ml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'kernel/mod_subst.ml')

diff --git a/kernel/mod_subst.ml b/kernel/mod_subst.ml
index 146da92c..ab8b60be 100644
--- a/kernel/mod_subst.ml
+++ b/kernel/mod_subst.ml
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(* $Id: mod_subst.ml 13414 2010-09-14 13:28:15Z glondu $ *)
+(* $Id: mod_subst.ml 14641 2011-11-06 11:59:10Z herbelin $ *)
 
 open Pp
 open Util
@@ -396,7 +396,9 @@ let subst_con sub con =
 		  let con = constant_of_delta2 resolve con' in
 		con,mkConst con
 	    end
-	  | Some t -> con',t
+	  | Some t ->
+	    (* In case of inlining, discard the canonical part (cf #2608) *)
+	    constant_of_kn (user_con con'), t
     with No_subst -> con , mkConst con 
  
 
@@ -730,3 +732,8 @@ let subst_substituted s r =
     | LSlazy(s',a) ->
 	  ref (LSlazy(s::s',a))
 
+(* debug *)
+let repr_substituted r =
+  match !r with
+    | LSval a -> None, a
+    | LSlazy(s,a) -> Some s, a
-- 
cgit v1.2.3