summaryrefslogtreecommitdiffstats
path: root/bytecomp/translobj.ml
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2008-10-08 13:09:39 +0000
committerDamien Doligez <damien.doligez-inria.fr>2008-10-08 13:09:39 +0000
commit2b0441401a9686529cfe8d97cf73ecc09a51bef5 (patch)
tree1e1bf18bb6810b34696e0e4329a60c3f6c1bcabb /bytecomp/translobj.ml
parent29e590ccb9fe1a9330a6809a972a0e84e80653f7 (diff)
merge changes between 3.10.2 and the end of branch 3.10
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9079 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'bytecomp/translobj.ml')
-rw-r--r--bytecomp/translobj.ml2
1 files changed, 2 insertions, 0 deletions
diff --git a/bytecomp/translobj.ml b/bytecomp/translobj.ml
index 9899e44b3..e97fbfc13 100644
--- a/bytecomp/translobj.ml
+++ b/bytecomp/translobj.ml
@@ -123,6 +123,7 @@ let transl_store_label_init glob size f arg =
let wrapping = ref false
let top_env = ref Env.empty
let classes = ref []
+let method_ids = ref IdentSet.empty
let oo_add_class id =
classes := id :: !classes;
@@ -138,6 +139,7 @@ let oo_wrap env req f x =
cache_required := req;
top_env := env;
classes := [];
+ method_ids := IdentSet.empty;
let lambda = f x in
let lambda =
List.fold_left