Correctly stack debuginfo for inlined body in classic mode #1152
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I will review this |
mshinwell
requested changes
Feb 28, 2023
|
Note: before merging this PR, we should wait for #1161 to be merged, and then i'll rebase this PR, and add tests to the |
mshinwell
approved these changes
Mar 2, 2023
mshinwell
requested changes
Mar 2, 2023
mshinwell
previously requested changes
Mar 2, 2023
mshinwell
approved these changes
Mar 2, 2023
Gbury
force-pushed
the
classic_mode_inlined_debuginfo
branch
from
ee01226
to
63bc543
Compare
|
This has been rebased on |
|
CI is green, this can be reviewed and merged. |
mshinwell
requested changes
Mar 10, 2023
mshinwell
approved these changes
Mar 13, 2023
mshinwell
pushed a commit
to mshinwell/flambda-backend
that referenced
this pull request
Mar 13, 2023
ccasin
added a commit
that referenced
this pull request
Mar 24, 2023
bcae5ff33 flambda-backend: Bump buffer size to avoid gcc warning (#1247) d6c170bac flambda-backend: Remove `-absname` to improve dune build errors (#1233) 1b2bcb487 flambda-backend: Put frametables in .text with relative offsets for return addresses. (#1227) 999d523b4 flambda-backend: Small optimisation for caml_modify (#1226) b16493b31 flambda-backend: Add timestamps to GC logs (#1229) 95f7e809e flambda-backend: Provide a no-naked-pointers runtime and use it for the compiler (#1224) ba775819d flambda-backend: Replace assertion with a match statement (#1225) cfb3cd242 flambda-backend: Memoise last substitution composition (#1209) 1c4db4405 flambda-backend: Port PR1202 and PR1205 to the ocaml/ subtree (#1211) 577410ee7 flambda-backend: Correctly stack debuginfo for inlined body in classic mode (#1152) 6733de6a5 flambda-backend: Fix dune install in otherlibs: missing cmt and typo. (#1194) 4c97d260e flambda-backend: Unboxed numbers (#1165) 1ad7252a0 flambda-backend: Revert "Revert "Add a proper top and bottom layout" (#1169)" (#1191) dea4b3e6b flambda-backend: Don't get the layout of arguments from patterns (#1179) 6d3e85b23 flambda-backend: Don't copy when resolving aliases in try_modtypes (#1184) 73e52b748 flambda-backend: Clarify the types used for static jump/catch (#1180) 273a40df2 flambda-backend: Reenable backtrace testsuite folder for flambda2 (#1161) 77434f02e flambda-backend: Bump magic numbers for 4.14.1-5 (#1190) 3a78e83c9 flambda-backend: Revert "Instance compilation units" (#1175) 9a683c928 flambda-backend: Move compute_layout to Lambda (#1167) 0ea58e9a3 flambda-backend: Revert "Add a proper top and bottom layout" (#1169) 1e5e23a1b flambda-backend: Add hint for common misplaced [@unboxed] attribute (#1164) 10f870ac9 flambda-backend: Add a proper top and bottom layout (#1158) d1be56335 flambda-backend: Don't warn about misplaced attributes in -i mode (#1163) feefcaac8 flambda-backend: Remove immutable arrays from stdlib.ml and stdlib.mli (#1154) ba101be42 flambda-backend: Shrink the ref_table if it grows large (#1156) 777fda7b9 flambda-backend: Preserve backtraces from failing `Lazy_backtrack` computations (#805) 56d014e05 flambda-backend: Remove remaining `layout_top` after #1084 (#1138) dc1c1ce89 flambda-backend: Layouts for parameters in lambda & remove most layout_top (#1084) 49fea7805 flambda-backend: Instance compilation units (#1113) 1127fd2f8 flambda-backend: Merge pull request #1143 from riaqn/merge-ocaml-jst f458733c8 flambda-backend: fix things after merge b43d38509 flambda-backend: File magic updates (#306) 9f604aaea flambda-backend: Merge ocaml-jst 1f5461386 flambda-backend: More assertions for local alloc and letrec (#1081) 0c95280ab flambda-backend: Remove most layout_top in closure (#1127) 8ad48b5b3 flambda-backend: Use only `.ocamlformat*` to enable or disable ocamlformat (#1135) 1aa2885a0 flambda-backend: Build all boot targets in `make hacking` (#1133) 6b6c25a85 flambda-backend: Hide `Compilation_unit.t`'s definition in a submodule (#1134) 529d66b6f flambda-backend: Compile refactor (#1096) df798c1c9 flambda-backend: Propagates layouts through Flambda1 (#1115) 9bce50be5 flambda-backend: Add `gc-timings` to collect timing information from the GC (#1089) d431d3b83 flambda-backend: Use the type of primitive declarations to make their layout (#1118) 8da887e0f flambda-backend: Changes to arity in clambda (#1106) db20e9724 flambda-backend: Fix simplify-exits (#1108) 6a63906ee flambda-backend: Add layout on Lregion (#1107) c562fb385 flambda-backend: caml_{curry,apply,send}* for unboxed types (#1104) 50ee311bc flambda-backend: Temporary fix for incorrect layout for result of custom and operators (#1119) c89512d64 flambda-backend: More error checking for natdynlink symbols (#1005) 27d68bf7e flambda-backend: Flambda1 region deletion and locals fixes (#1000) 0e3e0576e flambda-backend: Add identifiers for instantiated functor units (#1092) 4b75b460d flambda-backend: Fix build system under ocaml/runtime (#1085) 7c9fc3215 flambda-backend: Fix valid character range computation for compilation units (#1110) 40c754a7d flambda-backend: Add result layout in Lapply and Lsend (#1102) cedaea1e0 flambda-backend: Add layout type in Lambda (#1032) 47c0e23a2 flambda-backend: Configure: Add flag to use legacy library layout (#1098) eed588881 flambda-backend: Restructure LIBDIR: Move Dynlink, Str and Unix to sub-directories (port part of ocaml/PR11198) (#1094) 5b98caf9d flambda-backend: Revert "Restructure LIBDIR" (#1093) 46f1b16d7 flambda-backend: Remove a stray character from dynlink Makefile (#1090) e5154424a flambda-backend: Restructure LIBDIR: Move Dynlink, Str and Unix to sub-directories (port PR#11198) (#895) 9307e7c50 flambda-backend: inline fast path of caml_applyN (#934) 3244386e6 flambda-backend: Bump magic numbers (#1077) 7c9e15d2c flambda-backend: Fix bug in arguments to `get_unit_info` (#1069) a2f4c9e07 flambda-backend: Closure rename static catch (#1070) 2ee705a5b flambda-backend: Backport #946 to ocaml/ subfolder (#1061) 569703fb6 flambda-backend: Merge ocaml-jst#97 (#1063) 7b1779a77 flambda-backend: Port value_kind changes to testsuite/tools to fix parsecmm.mly (#1060) 49505d183 flambda-backend: Bugfix for Ctype.nondep_type (#1059) 654c63cf7 flambda-backend: Backport #295 kind changes to ocaml/ subfolder (#1018) 50a9ce0bf flambda-backend: Fix extern_closure_up_to_env (#1053) bc2c78d2e flambda-backend: Remove obsolete pack-related code (#1051) 872ff3818 flambda-backend: Fix error-prone syntax resulting from reformatting (#1050) d03b346cf flambda-backend: Fix different .cmi files being produced by ocamlopt and ocamlc when using -pack (#1049) 90ee37b48 flambda-backend: Revert "Revert "Use Import_info.t in Cmt_format"" (#1045) ac12d9072 flambda-backend: Fix version number (#1043) 75e01541e flambda-backend: Revert "Use Import_info.t in Cmt_format" (#1042) ecab74c38 flambda-backend: Use Import_info.t in Cmt_format (#1037) 7661d4d47 flambda-backend: Bootstrap 1098a56c6 flambda-backend: Update .depend files a7292dae2 flambda-backend: Revert ocaml/toplevel/native/dune 758447903 flambda-backend: Remove alloc-check from ocaml/ git-subtree-dir: ocaml git-subtree-split: bcae5ff335d548b92752f53817d5b08ab2b98ff9
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should close #1121 .
We introduce a new nullary primitive, that is isnerted at the beginning of every function body inlined when in classic mode. This primitive is then used in to_cmm to correctly concatenate/stack the debuginfos inside of the inlined bodies. To do so,
to_cmm_envis extended to record the debuginfo of the currently inlined body (if any), and continuations stored in the env for inlining are stored together with the current inlined debuginfo, so that it can be restored when the continuation is inlined.to_cmmcan then add the inlined debuginfo to all the debuginfos that are used in the generated cmm.