Skip to content

Commit 4c1c259

Browse files
gretay-jspoechsel
gretay-js
authored and
poechsel
committed
flambda-backend: ocaml#9748 from xclerc/share-ev_defname (cherry-pick 3e937fcb562)
Ensure that string representations of scopes are shared.
1 parent 00027c4 commit 4c1c259

91 files changed

Lines changed: 1132 additions & 170 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.depend‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2471,15 +2471,19 @@ asmcomp/emit.cmo : \
24712471
asmcomp/x86_gas.cmi \
24722472
asmcomp/x86_dsl.cmi \
24732473
asmcomp/x86_ast.cmi \
2474+
utils/warnings.cmi \
24742475
asmcomp/reg.cmi \
24752476
asmcomp/proc.cmi \
2477+
asmcomp/printmach.cmi \
24762478
utils/numbers.cmi \
24772479
utils/misc.cmi \
24782480
asmcomp/mach.cmi \
2481+
parsing/location.cmi \
24792482
asmcomp/linear.cmi \
24802483
lambda/lambda.cmi \
24812484
asmcomp/emitaux.cmi \
24822485
utils/domainstate.cmi \
2486+
lambda/debuginfo.cmi \
24832487
utils/config.cmi \
24842488
middle_end/compilenv.cmi \
24852489
asmcomp/cmm.cmi \
@@ -2493,15 +2497,19 @@ asmcomp/emit.cmx : \
24932497
asmcomp/x86_gas.cmx \
24942498
asmcomp/x86_dsl.cmx \
24952499
asmcomp/x86_ast.cmi \
2500+
utils/warnings.cmx \
24962501
asmcomp/reg.cmx \
24972502
asmcomp/proc.cmx \
2503+
asmcomp/printmach.cmx \
24982504
utils/numbers.cmx \
24992505
utils/misc.cmx \
25002506
asmcomp/mach.cmx \
2507+
parsing/location.cmx \
25012508
asmcomp/linear.cmx \
25022509
lambda/lambda.cmx \
25032510
asmcomp/emitaux.cmx \
25042511
utils/domainstate.cmx \
2512+
lambda/debuginfo.cmx \
25052513
utils/config.cmx \
25062514
middle_end/compilenv.cmx \
25072515
asmcomp/cmm.cmx \
@@ -2748,10 +2756,12 @@ asmcomp/proc.cmi : \
27482756
asmcomp/reg.cmo : \
27492757
asmcomp/cmm.cmi \
27502758
middle_end/backend_var.cmi \
2759+
asmcomp/arch.cmo \
27512760
asmcomp/reg.cmi
27522761
asmcomp/reg.cmx : \
27532762
asmcomp/cmm.cmx \
27542763
middle_end/backend_var.cmx \
2764+
asmcomp/arch.cmx \
27552765
asmcomp/reg.cmi
27562766
asmcomp/reg.cmi : \
27572767
asmcomp/cmm.cmi \

‎Makefile.config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ WINDOWS_UNICODE=@windows_unicode@
238238
AFL_INSTRUMENT=@afl@
239239
FLAT_FLOAT_ARRAY=@flat_float_array@
240240
FUNCTION_SECTIONS=@function_sections@
241+
PROBES=@probes@
241242
AWK=@AWK@
242243
STDLIB_MANPAGES=@stdlib_manpages@
243244
NAKED_POINTERS=@naked_pointers@

‎asmcomp/CSEgen.ml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ method class_of_operation op =
223223
| Imove | Ispill | Ireload -> assert false (* treated specially *)
224224
| Iconst_int _ | Iconst_float _ | Iconst_symbol _ -> Op_pure
225225
| Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
226-
| Iextcall _ -> assert false (* treated specially *)
226+
| Iextcall _ | Iprobe _ -> assert false (* treated specially *)
227227
| Istackoffset _ -> Op_other
228228
| Iload(_,_) -> Op_load
229229
| Istore(_,_,asg) -> Op_store asg
@@ -236,6 +236,7 @@ method class_of_operation op =
236236
| Ifloatofint | Iintoffloat -> Op_pure
237237
| Ispecific _ -> Op_other
238238
| Iname_for_debugger _ -> Op_pure
239+
| Iprobe_is_enabled _ -> Op_other
239240

240241
(* Operations that are so cheap that it isn't worth factoring them. *)
241242

@@ -263,7 +264,7 @@ method private cse n i =
263264
as to the argument reg. *)
264265
let n1 = set_move n i.arg.(0) i.res.(0) in
265266
{i with next = self#cse n1 i.next}
266-
| Iop (Icall_ind | Icall_imm _ | Iextcall _) ->
267+
| Iop (Icall_ind | Icall_imm _ | Iextcall _ | Iprobe _) ->
267268
(* For function calls, we should at least forget:
268269
- equations involving memory loads, since the callee can
269270
perform arbitrary memory stores;

0 commit comments

Comments
 (0)