Skip to content

Sync with upstream (2 commits through 552e598353) - #8

Merged
Sam Gammon (sgammon) merged 2 commits into
elide-25.5.xfrom
upstream/sync-2026-10-17
Oct 18, 2026
Merged

Sam Gammon (sgammon) merged 2 commits into
elide-25.5.xfrom
upstream/sync-2026-10-17

Conversation

@sgammon

@sgammon Sam Gammon (sgammon) commented Oct 17, 2026 •

Copy link
Copy Markdown
Member

Brings elide-25.5.x up to graalvm/graalpython master 972404ceb7 (2026-10-16), minus the commits skipped below. Cherry-picked with -x; please rebase-merge so the (cherry picked from commit ...) trailers are kept.

Picked (2)

  • aaa08da195 [GR-80371] Exclude generated C API assertions from JaCoCo
  • 552e598353 Update unittest tags

No conflicts.

Skipped (7), with reasons

  • bdac2d9d13, f76c88df79, ff0c9aeded, c84c43dbd8 (PosixSupportLibrary conversions): already on the fork. Upstream sync: 112 commits through upstream a099d00643, and CI on self-hosted runners #6 picked them (as b75b30c40d, d5e2dccc7c, 6391368bda, 0ee91303fd); bdac2d9d13 and c84c43dbd8 needed conflict resolution in PosixModuleBuiltins (see Upstream sync: 112 commits through upstream a099d00643, and CI on self-hosted runners #6), so their patch-ids differ and git log --cherry-pick still lists them. The cherry picked from trailers confirm they are present.
  • d0e46126b0 Update imports: not taken. It moves the tools/regex pins in mx.graalpython/suite.py to oracle/graal f1dce3f84de, which is not an ancestor of the fork's graal elide-25.5.x or upstream/wave-10, and bumps labsjdk (jvmci-25.4-b23 to 25.5-b24), mx (7.87.0 to 7.88.0) and the GraalOS resource pins in ci/graal/common.json / graalos_versions.json. The fork keeps the pin at 5727d2bee28 (as in Upstream sync: 112 commits through upstream a099d00643, and CI on self-hosted runners #6). It should be taken together with the matching graal and JDK update.
  • 972404ceb7 Preserve pending input during terminal initialization (GR-80639): blocked on the graal pin, not on content. It calls TerminalBuilder.graphemeCluster(false), which the JLine on the pinned graal 5727d2bee28 does not have, so CI fails with cannot find symbol in JLineConsoleHandler.java:103 (the first push of this PR included it and failed style-gate, abi-check, tier2/3 python-svm builds for that reason). It builds against the fork's graal wave-10, which carries the newer JLine, so it can follow when the graal pin moves forward together with d0e46126b0.
  • af3256cc9a Fix style (TpSlotDescrGet permits indentation): the style gate here runs the eclipse formatter of the pinned graal 5727d2bee28, which wants the previous indentation. With this commit the gate fails (CodeFormatCheck: 1 files were modified, TpSlotDescrGet.java). It goes together with the newer graal import (d0e46126b0).

Testing

Sibling layout: graal = elide/upstream/wave-10 (14403bb2cda), graalpython = this branch plus 972404ceb7 and af3256cc9a (tested locally before it was dropped), labsjdk-ce-latest-jvmci-25.4-b23.

  • mx build --build-logs=silent: OK.
  • mx graalpytest tests/test_posix.py tests/test_pickle.py: 96 run, 88 passed, 8 skipped, 0 failed.
  • mx graalpytest --tagged test_os.py test_posix.py test_genericpath.py test_mmap.py test_locale.py test_site.py: 400 run, all passed (these cover the retagged files).
  • With 972404ceb7 applied, graalpy -i under a pty with print(6*7) queued before startup executes it and prints 42.

@sgammon Sam Gammon (sgammon) changed the title Sync with upstream (4 commits through 972404ceb7) Sync with upstream (3 commits through af3256cc9a) Oct 17, 2026
@sgammon Sam Gammon (sgammon) changed the title Sync with upstream (3 commits through af3256cc9a) Sync with upstream (2 commits through 552e598353) Oct 17, 2026
@sgammon
Sam Gammon (sgammon) merged commit 651075a into elide-25.5.x Oct 18, 2026
65 checks passed
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.

3 participants