Skip to content

Merge train: #9564 #9565 (mysql2 fallback; cross-thread promise pinning) #9569

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.

Sign up for GitHub

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

Merged
proggeramlug merged 3 commits into from
Sep 2, 2026
Merged

Merge train: #9564 #9565 (mysql2 fallback; cross-thread promise pinning) #9569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df1ac89
fix(mysql2): align bundled fallback semantics
Sep 2, 2026
9b0b16c
fix(runtime): pin cross-thread promises in their constructor until th…
Sep 2, 2026
1e988e9
fix(test): initialize native_pinned in the three gc test-fixture Prom…
Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,16 @@ jobs:
python3 scripts/gc_pin_sites.py --self-test
python3 scripts/gc_pin_sites.py

# #9552. A promise handed to native code as a bare address is invisible
# to every root scanner until its completion is queued back. The
# cross-thread constructor pins it for that window; the arena constructor
# cannot. This finds arena promises reaching a native settlement sink.
- name: Cross-thread promise provenance (#9552)
if: ${{ !cancelled() }}
run: |
python3 scripts/check_cross_thread_promise_provenance.py --self-test
python3 scripts/check_cross_thread_promise_provenance.py

# #7231. A runtime-side table holding a GC pointer IS a root, and nothing
# static could see that class before: gc_root_dominance_check.py reads
# emitted LLVM IR and a thread_local is not in it. #7226, #7239, #7268 and
Expand Down
24 changes: 12 additions & 12 deletions crates/perry-codegen/src/lower_call/native_table/databases.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "query",
class_filter: Some("Pool"),
runtime: "js_mysql2_pool_query",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -54,7 +54,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "execute",
class_filter: Some("Pool"),
runtime: "js_mysql2_pool_execute",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -72,7 +72,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "query",
class_filter: Some("Pool"),
runtime: "js_mysql2_pool_query",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -81,7 +81,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "execute",
class_filter: Some("Pool"),
runtime: "js_mysql2_pool_execute",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -100,7 +100,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "query",
class_filter: Some("PoolConnection"),
runtime: "js_mysql2_pool_connection_query",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -109,7 +109,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "execute",
class_filter: Some("PoolConnection"),
runtime: "js_mysql2_pool_connection_execute",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -118,7 +118,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "query",
class_filter: Some("PoolConnection"),
runtime: "js_mysql2_pool_connection_query",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -127,7 +127,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "execute",
class_filter: Some("PoolConnection"),
runtime: "js_mysql2_pool_connection_execute",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
// mysql2 generic instance methods (Connection fallback, class_filter: None)
Expand All @@ -137,7 +137,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "query",
class_filter: None,
runtime: "js_mysql2_connection_query",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -146,7 +146,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "execute",
class_filter: None,
runtime: "js_mysql2_connection_execute",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand Down Expand Up @@ -209,7 +209,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "query",
class_filter: None,
runtime: "js_mysql2_connection_query",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand All @@ -218,7 +218,7 @@ pub(super) const DATABASES_ROWS: &[NativeModSig] = &[
method: "execute",
class_filter: None,
runtime: "js_mysql2_connection_execute",
args: &[NA_STR, NA_F64],
args: &[NA_F64, NA_F64],
ret: NR_PTR,
},
NativeModSig {
Expand Down
Loading
Loading