Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

port #797 (long frames in frametable) #2048

Merged
merged 2 commits into from
Nov 20, 2023

Conversation

riaqn
Copy link
Contributor

@riaqn riaqn commented Nov 20, 2023

This ports #797.

I checked that all direct access of ->live_ofs and ->num_live are safe. Remaining accesses are indirect via the frame_end_of_live_ofs which are aware of long format. Similar for ->frame_data.

@riaqn riaqn changed the title port #797 port #797 (long frames in frametable) Nov 20, 2023
ocaml/runtime/caml/frame_descriptors.h Outdated Show resolved Hide resolved
ocaml/runtime/caml/frame_descriptors.h Outdated Show resolved Hide resolved
ocaml/runtime/caml/frame_descriptors.h Show resolved Hide resolved
@riaqn
Copy link
Contributor Author

riaqn commented Nov 20, 2023

@gretay-js Thanks for the review - can you look again?

@riaqn riaqn merged commit 8b2867b into ocaml-flambda:runtime5-features-mshinwell Nov 20, 2023
9 of 18 checks passed
mshinwell added a commit that referenced this pull request Nov 21, 2023
* Dummy C stubs

* Run max_arity_locals test only when stack allocation is enabled

* Fix and promote typing-local/ tests for stack allocation being disabled

* Predicate some tests on having stack allocation

* Forward port all SIMD runtime changes from d3c1413

* Fix globrootsprim.c test

* Fix asmgen tests

* Add runtime4 predicate to ocamltest and use it in runtime-naked-pointers/ tests

* Add runtime_dir ocamltest variable + use it to fix output-complete-obj/ tests

* git mv debugger debugger4

* Import debugger/ from upstream 5

* Debugger build system

* Apply JS-specific modifications from debugger4/ -> debugger/

* Fix pr9971 test

* Fix tests/regression/pr9326

* Fix tests/gc-roots

* Fix tests/asmcomp/polling.c

* Fixing of backtrace tests

* Skip instrumented-runtime tests on 5.x (these tests are not present in upstream 5)

* Fix Ctype.unify call in debugger/loadprinter.ml

* Fixes for systhreads/ build and importing of build attributes from systhreads4/

* Add Condition, Mutex and Semaphore to the stdlib

* Fix dynlink (including for move of Mutex to the stdlib)

* Fix get_header.ml test

* Add runtime5 predicate in ocamltest and use it to fix backtrace_c_exn.ml

* Fix wrong position of modules line in ocaml/testsuite/tests/typing-local/regions.ml test header

* Fix bug in caml_gc_counters in the 5 runtime

* Remove ocaml/otherlibs/systhreads4/st_pthreads.h, merge error

* Promote tests

* Move caml_stat_free call in ocaml/runtime4/dynlink_nat.c

* port #797 (long frames in frametable) (#2048)

* Fix upstream bug with dynlink check/registration ordering, and revert lib-dynlink-private testcase

* Fix caml_natdynlink_run_toplevel to actually call the registration function

* Add GC test for ocamlnat

* Address code review comments

* Regenerate stdlib/.depend

* Fix upstream build

* Fix three runtime4/ occurrences

* Fix for upstream systhreads4 build

* Don't skip statmemprof tests on runtime4/

* Fix upstream build for debugger4/

* Use runtime_dir not RUNTIME_DIR in the testsuite scriptsd

* Re-enabling (for runtime4) and fixing statmemprof tests

* Fix _runtest debugger installation paths

* Port bc9a60d to runtime/ (fix for caml_natdynlink_run_toplevel)

* Address comments

---------

Co-authored-by: Zesen Qian <[email protected]>
Co-authored-by: Stephen Dolan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants