Skip to content

Commit faf44eb

Browse files
committed
address comments
1 parent 3b6e2a6 commit faf44eb

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

jscomp/core/lam_primitive.ml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ let eq_field_dbg_info (x : Lam_compat.field_dbg_info) (y : Lam_compat.field_dbg_
185185
let eq_set_field_dbg_info (x : Lam_compat.set_field_dbg_info) (y : Lam_compat.set_field_dbg_info) =
186186
x = y (* save it to avoid conditional compilation, fix it later *)
187187

188+
let eq_tag_info ( x : Lam_tag_info.t) y =
189+
x = y
190+
188191
let eq_record_representation ( p : record_representation) ( p1 : record_representation) =
189192
match p with
190193
| Record_float -> p1 = Record_float
@@ -280,9 +283,9 @@ let eq_primitive_approx ( lhs : t) (rhs : t) =
280283
(match rhs with Psetfield(i1, info1) -> i0 = i1 && eq_set_field_dbg_info info0 info1 | _ -> false)
281284
| Psetfloatfield (i0, info0) ->
282285
(match rhs with Psetfloatfield(i1,info1) -> i0 = i1 && eq_set_field_dbg_info info0 info1 | _ -> false)
283-
| Pmakeblock (i, info0, flag0) ->
286+
| Pmakeblock (i0, info0, flag0) ->
284287
(match rhs with Pmakeblock(i1,info1,flag1) ->
285-
i = i1 && flag0 = flag1 && info0 = info1 | _ -> false)
288+
i0 = i1 && flag0 = flag1 && eq_tag_info info0 info1 | _ -> false)
286289

287290
| Pglobal_exception ident -> (match rhs with Pglobal_exception ident2 -> Ident.same ident ident2 | _ -> false )
288291
| Pduprecord (record_repesentation0,i1) -> (match rhs with Pduprecord(record_repesentation1,i2) -> eq_record_representation record_repesentation0 record_repesentation1 && i1 = i2 | _ -> false)

lib/4.02.3/unstable/js_compiler.ml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73933,6 +73933,9 @@ let eq_field_dbg_info (x : Lam_compat.field_dbg_info) (y : Lam_compat.field_dbg_
7393373933
let eq_set_field_dbg_info (x : Lam_compat.set_field_dbg_info) (y : Lam_compat.set_field_dbg_info) =
7393473934
x = y (* save it to avoid conditional compilation, fix it later *)
7393573935

73936+
let eq_tag_info ( x : Lam_tag_info.t) y =
73937+
x = y
73938+
7393673939
let eq_record_representation ( p : record_representation) ( p1 : record_representation) =
7393773940
match p with
7393873941
| Record_float -> p1 = Record_float
@@ -74017,9 +74020,9 @@ let eq_primitive_approx ( lhs : t) (rhs : t) =
7401774020
(match rhs with Psetfield(i1, info1) -> i0 = i1 && eq_set_field_dbg_info info0 info1 | _ -> false)
7401874021
| Psetfloatfield (i0, info0) ->
7401974022
(match rhs with Psetfloatfield(i1,info1) -> i0 = i1 && eq_set_field_dbg_info info0 info1 | _ -> false)
74020-
| Pmakeblock (i, info0, flag0) ->
74023+
| Pmakeblock (i0, info0, flag0) ->
7402174024
(match rhs with Pmakeblock(i1,info1,flag1) ->
74022-
i = i1 && flag0 = flag1 && info0 = info1 | _ -> false)
74025+
i0 = i1 && flag0 = flag1 && eq_tag_info info0 info1 | _ -> false)
7402374026

7402474027
| Pglobal_exception ident -> (match rhs with Pglobal_exception ident2 -> Ident.same ident ident2 | _ -> false )
7402574028
| Pduprecord (record_repesentation0,i1) -> (match rhs with Pduprecord(record_repesentation1,i2) -> eq_record_representation record_repesentation0 record_repesentation1 && i1 = i2 | _ -> false)

lib/4.02.3/whole_compiler.ml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65506,6 +65506,9 @@ let eq_field_dbg_info (x : Lam_compat.field_dbg_info) (y : Lam_compat.field_dbg_
6550665506
let eq_set_field_dbg_info (x : Lam_compat.set_field_dbg_info) (y : Lam_compat.set_field_dbg_info) =
6550765507
x = y (* save it to avoid conditional compilation, fix it later *)
6550865508

65509+
let eq_tag_info ( x : Lam_tag_info.t) y =
65510+
x = y
65511+
6550965512
let eq_record_representation ( p : record_representation) ( p1 : record_representation) =
6551065513
match p with
6551165514
| Record_float -> p1 = Record_float
@@ -65590,9 +65593,9 @@ let eq_primitive_approx ( lhs : t) (rhs : t) =
6559065593
(match rhs with Psetfield(i1, info1) -> i0 = i1 && eq_set_field_dbg_info info0 info1 | _ -> false)
6559165594
| Psetfloatfield (i0, info0) ->
6559265595
(match rhs with Psetfloatfield(i1,info1) -> i0 = i1 && eq_set_field_dbg_info info0 info1 | _ -> false)
65593-
| Pmakeblock (i, info0, flag0) ->
65596+
| Pmakeblock (i0, info0, flag0) ->
6559465597
(match rhs with Pmakeblock(i1,info1,flag1) ->
65595-
i = i1 && flag0 = flag1 && info0 = info1 | _ -> false)
65598+
i0 = i1 && flag0 = flag1 && eq_tag_info info0 info1 | _ -> false)
6559665599

6559765600
| Pglobal_exception ident -> (match rhs with Pglobal_exception ident2 -> Ident.same ident ident2 | _ -> false )
6559865601
| Pduprecord (record_repesentation0,i1) -> (match rhs with Pduprecord(record_repesentation1,i2) -> eq_record_representation record_repesentation0 record_repesentation1 && i1 = i2 | _ -> false)

0 commit comments

Comments
 (0)