Skip to content

Commit 5eb6786

Browse files
bobzhangbobzhang
committed
remove Clflags.fast detection which is done in syntax level
1 parent 360fdd0 commit 5eb6786

File tree

4 files changed

+16
-80
lines changed

4 files changed

+16
-80
lines changed

‎jscomp/core/lam_compile_primitive.ml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -503,16 +503,11 @@ let translate loc
503503
(match args with
504504
| [e;e1] -> Js_of_lam_string.ref_byte e e1
505505
| _ -> assert false)
506-
507-
508506
| Pbytesrefs ->
509-
begin match args with
510-
| [e ; e1] ->
511-
if !Clflags.fast then
512-
Js_of_lam_string.ref_byte e e1
513-
else E.runtime_call Js_runtime_modules.bytes "get" args
514-
| _ -> assert false
515-
end
507+
E.runtime_call Js_runtime_modules.bytes "get" args
508+
| Pstringrefs ->
509+
E.runtime_call Js_runtime_modules.string "get" args
510+
516511
(* For bytes and string, they both return [int] in ocaml
517512
we need tell Pbyteref from Pstringref
518513
1. Pbyteref -> a[i]
@@ -523,19 +518,8 @@ let translate loc
523518
| [e;e1] -> Js_of_lam_string.ref_string e e1
524519
| _ -> assert false
525520
end
526-
527-
| Pstringrefs ->
528-
begin match args with
529-
| [e;e1] ->
530-
if !Clflags.fast then
531-
Js_of_lam_string.ref_string e e1
532-
else
533-
E.runtime_call Js_runtime_modules.string "get" args
534-
| _ -> assert false
535-
end
536521
(** only when Lapply -> expand = true*)
537522
| Praise -> assert false (* handled before here *)
538-
539523
(* Runtime encoding relevant *)
540524
| Parraylength ->
541525
E.array_length (Ext_list.singleton_exn args)

‎lib/4.06.1/unstable/js_compiler.ml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -111918,16 +111918,11 @@ let translate loc
111918111918
(match args with
111919111919
| [e;e1] -> Js_of_lam_string.ref_byte e e1
111920111920
| _ -> assert false)
111921-
111922-
111923111921
| Pbytesrefs ->
111924-
begin match args with
111925-
| [e ; e1] ->
111926-
if !Clflags.fast then
111927-
Js_of_lam_string.ref_byte e e1
111928-
else E.runtime_call Js_runtime_modules.bytes "get" args
111929-
| _ -> assert false
111930-
end
111922+
E.runtime_call Js_runtime_modules.bytes "get" args
111923+
| Pstringrefs ->
111924+
E.runtime_call Js_runtime_modules.string "get" args
111925+
111931111926
(* For bytes and string, they both return [int] in ocaml
111932111927
we need tell Pbyteref from Pstringref
111933111928
1. Pbyteref -> a[i]
@@ -111938,19 +111933,8 @@ let translate loc
111938111933
| [e;e1] -> Js_of_lam_string.ref_string e e1
111939111934
| _ -> assert false
111940111935
end
111941-
111942-
| Pstringrefs ->
111943-
begin match args with
111944-
| [e;e1] ->
111945-
if !Clflags.fast then
111946-
Js_of_lam_string.ref_string e e1
111947-
else
111948-
E.runtime_call Js_runtime_modules.string "get" args
111949-
| _ -> assert false
111950-
end
111951111936
(** only when Lapply -> expand = true*)
111952111937
| Praise -> assert false (* handled before here *)
111953-
111954111938
(* Runtime encoding relevant *)
111955111939
| Parraylength ->
111956111940
E.array_length (Ext_list.singleton_exn args)

‎lib/4.06.1/unstable/js_refmt_compiler.ml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -111918,16 +111918,11 @@ let translate loc
111918111918
(match args with
111919111919
| [e;e1] -> Js_of_lam_string.ref_byte e e1
111920111920
| _ -> assert false)
111921-
111922-
111923111921
| Pbytesrefs ->
111924-
begin match args with
111925-
| [e ; e1] ->
111926-
if !Clflags.fast then
111927-
Js_of_lam_string.ref_byte e e1
111928-
else E.runtime_call Js_runtime_modules.bytes "get" args
111929-
| _ -> assert false
111930-
end
111922+
E.runtime_call Js_runtime_modules.bytes "get" args
111923+
| Pstringrefs ->
111924+
E.runtime_call Js_runtime_modules.string "get" args
111925+
111931111926
(* For bytes and string, they both return [int] in ocaml
111932111927
we need tell Pbyteref from Pstringref
111933111928
1. Pbyteref -> a[i]
@@ -111938,19 +111933,8 @@ let translate loc
111938111933
| [e;e1] -> Js_of_lam_string.ref_string e e1
111939111934
| _ -> assert false
111940111935
end
111941-
111942-
| Pstringrefs ->
111943-
begin match args with
111944-
| [e;e1] ->
111945-
if !Clflags.fast then
111946-
Js_of_lam_string.ref_string e e1
111947-
else
111948-
E.runtime_call Js_runtime_modules.string "get" args
111949-
| _ -> assert false
111950-
end
111951111936
(** only when Lapply -> expand = true*)
111952111937
| Praise -> assert false (* handled before here *)
111953-
111954111938
(* Runtime encoding relevant *)
111955111939
| Parraylength ->
111956111940
E.array_length (Ext_list.singleton_exn args)

‎lib/4.06.1/whole_compiler.ml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -394010,16 +394010,11 @@ let translate loc
394010394010
(match args with
394011394011
| [e;e1] -> Js_of_lam_string.ref_byte e e1
394012394012
| _ -> assert false)
394013-
394014-
394015394013
| Pbytesrefs ->
394016-
begin match args with
394017-
| [e ; e1] ->
394018-
if !Clflags.fast then
394019-
Js_of_lam_string.ref_byte e e1
394020-
else E.runtime_call Js_runtime_modules.bytes "get" args
394021-
| _ -> assert false
394022-
end
394014+
E.runtime_call Js_runtime_modules.bytes "get" args
394015+
| Pstringrefs ->
394016+
E.runtime_call Js_runtime_modules.string "get" args
394017+
394023394018
(* For bytes and string, they both return [int] in ocaml
394024394019
we need tell Pbyteref from Pstringref
394025394020
1. Pbyteref -> a[i]
@@ -394030,19 +394025,8 @@ let translate loc
394030394025
| [e;e1] -> Js_of_lam_string.ref_string e e1
394031394026
| _ -> assert false
394032394027
end
394033-
394034-
| Pstringrefs ->
394035-
begin match args with
394036-
| [e;e1] ->
394037-
if !Clflags.fast then
394038-
Js_of_lam_string.ref_string e e1
394039-
else
394040-
E.runtime_call Js_runtime_modules.string "get" args
394041-
| _ -> assert false
394042-
end
394043394028
(** only when Lapply -> expand = true*)
394044394029
| Praise -> assert false (* handled before here *)
394045-
394046394030
(* Runtime encoding relevant *)
394047394031
| Parraylength ->
394048394032
E.array_length (Ext_list.singleton_exn args)

0 commit comments

Comments
 (0)