fix rescript-lang#2274

Author: bobzhang

Diff for: jscomp/all.depend

@@ -676,8 +676,8 @@ core/lam_compile_main.cmx : ext/literals.cmx core/lam_util.cmx \
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
     core/lam_compile_main.cmx core/lam_compile_env.cmx common/js_config.cmx \
     ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
-    common/ext_log.cmx ext/ext_io.cmx syntax/bs_ast_invariant.cmx \
-    depends/binary_ast.cmx core/js_implementation.cmi
+    common/ext_log.cmx ext/ext_io.cmx depends/binary_ast.cmx \
+    core/js_implementation.cmi
 core/ocaml_batch_compile.cmx : core/ocaml_parse.cmx \
     core/js_implementation.cmx common/js_config.cmx ext/ext_ref.cmx \
     ext/ext_pervasives.cmx ext/ext_namespace.cmx ext/ext_modulename.cmx \

Diff for: jscomp/core/js_implementation.ml

@@ -20,7 +20,7 @@ open Compenv
 
 let fprintf = Format.fprintf
 
-let dummy_unused_attribute : Warnings.t = (Bs_unused_attribute "")
+
 
 let print_if ppf flag printer arg =
   if !flag then fprintf ppf "%a@." printer arg;
@@ -41,8 +41,7 @@ let after_parsing_sig ppf sourcefile outputprefix ast  =
     end;
   if !Js_config.syntax_only then () else 
     begin 
-      if Warnings.is_active dummy_unused_attribute then 
-        Bs_ast_invariant.emit_external_warnings.signature Bs_ast_invariant.emit_external_warnings ast ;
+
       if Js_config.get_diagnose () then
         Format.fprintf Format.err_formatter "Building %s@." sourcefile;    
       let modulename = module_of_filename ppf sourcefile outputprefix in
@@ -86,9 +85,7 @@ let after_parsing_impl ppf sourcefile outputprefix ast =
       ast ;
   if !Js_config.syntax_only then () else 
     begin
-
-      if Warnings.is_active dummy_unused_attribute then 
-        Bs_ast_invariant.emit_external_warnings.structure Bs_ast_invariant.emit_external_warnings ast ;
+      
       if Js_config.get_diagnose () then
         Format.fprintf Format.err_formatter "Building %s@." sourcefile;      
       let modulename = Compenv.module_of_filename ppf sourcefile outputprefix in

Diff for: jscomp/syntax/ppx_entry.ml

@@ -687,7 +687,7 @@ let signature_config_table :
   (Parsetree.expression option -> unit) String_map.t= 
   String_map.of_list common_actions_table
 
-
+let dummy_unused_attribute : Warnings.t = (Bs_unused_attribute "")
 
 let rewrite_signature : 
   (Parsetree.signature  -> Parsetree.signature) ref = 
@@ -703,7 +703,10 @@ let rewrite_signature :
           end
         | _ -> 
           unsafe_mapper.signature  unsafe_mapper x in 
-      reset (); result 
+      reset ();
+      if Warnings.is_active dummy_unused_attribute then 
+        Bs_ast_invariant.emit_external_warnings.signature Bs_ast_invariant.emit_external_warnings ast ;
+      result 
     )
 
 let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref = 
@@ -727,5 +730,9 @@ let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref =
           end
         | _ -> 
           unsafe_mapper.structure  unsafe_mapper x  in 
-      reset (); result )
+      reset (); 
+      (if Warnings.is_active dummy_unused_attribute then 
+         Bs_ast_invariant.emit_external_warnings.structure Bs_ast_invariant.emit_external_warnings result);
+      result 
+    )
 

Diff for: jscomp/syntax/ppx_entry.mli

@@ -25,9 +25,11 @@
 
 
 
-val rewrite_signature :   (Parsetree.signature -> Parsetree.signature) ref
+val rewrite_signature :   
+  (Parsetree.signature -> Parsetree.signature) ref
 
-val rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref
+val rewrite_implementation : 
+  (Parsetree.structure -> Parsetree.structure) ref
 
 
 

Diff for: lib/bsdep.ml

@@ -31185,7 +31185,7 @@ let init () =
                             (Exp.fun_ "" None 
                                (Pat.var pat_param)
                                (if createType then 
-                                  (eraseType (Exp.constraint_ exp_param newType) -~ const_int offset)
+                                  (( exp_param +: newType) -~ const_int offset)
                                   +>
                                   core_type
                                 else
@@ -35477,9 +35477,11 @@ module Ppx_entry : sig
 
 
 
-val rewrite_signature :   (Parsetree.signature -> Parsetree.signature) ref
+val rewrite_signature :   
+  (Parsetree.signature -> Parsetree.signature) ref
 
-val rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref
+val rewrite_implementation : 
+  (Parsetree.structure -> Parsetree.structure) ref
 
 
 
@@ -36248,7 +36250,9 @@ let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref =
           end
         | _ -> 
           unsafe_mapper.structure  unsafe_mapper x  in 
-      reset (); result )
+      reset (); 
+      result 
+      )
 
 
 end

Diff for: lib/bsppx.ml

@@ -13133,7 +13133,7 @@ let init () =
                             (Exp.fun_ "" None 
                                (Pat.var pat_param)
                                (if createType then 
-                                  (eraseType (Exp.constraint_ exp_param newType) -~ const_int offset)
+                                  (( exp_param +: newType) -~ const_int offset)
                                   +>
                                   core_type
                                 else
@@ -18594,9 +18594,11 @@ module Ppx_entry : sig
 
 
 
-val rewrite_signature :   (Parsetree.signature -> Parsetree.signature) ref
+val rewrite_signature :   
+  (Parsetree.signature -> Parsetree.signature) ref
 
-val rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref
+val rewrite_implementation : 
+  (Parsetree.structure -> Parsetree.structure) ref
 
 
 
@@ -19365,7 +19367,9 @@ let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref =
           end
         | _ -> 
           unsafe_mapper.structure  unsafe_mapper x  in 
-      reset (); result )
+      reset (); 
+      result 
+      )
 
 
 end

Diff for: lib/whole_compiler.ml

@@ -105952,7 +105952,7 @@ let init () =
                             (Exp.fun_ "" None 
                                (Pat.var pat_param)
                                (if createType then 
-                                  (eraseType (Exp.constraint_ exp_param newType) -~ const_int offset)
+                                  (( exp_param +: newType) -~ const_int offset)
                                   +>
                                   core_type
                                 else
@@ -109391,9 +109391,11 @@ module Ppx_entry : sig
 
 
 
-val rewrite_signature :   (Parsetree.signature -> Parsetree.signature) ref
+val rewrite_signature :   
+  (Parsetree.signature -> Parsetree.signature) ref
 
-val rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref
+val rewrite_implementation : 
+  (Parsetree.structure -> Parsetree.structure) ref
 
 
 
@@ -110162,7 +110164,9 @@ let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref =
           end
         | _ -> 
           unsafe_mapper.structure  unsafe_mapper x  in 
-      reset (); result )
+      reset (); 
+      result 
+      )
 
 
 end
@@ -113807,7 +113811,6 @@ let after_parsing_impl ppf sourcefile outputprefix ast =
       ast ;
   if !Js_config.syntax_only then () else 
     begin
-
       if Warnings.is_active dummy_unused_attribute then 
         Bs_ast_invariant.emit_external_warnings.structure Bs_ast_invariant.emit_external_warnings ast ;
       if Js_config.get_diagnose () then