Skip to content

[pull] master from ruby:master #322

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
pull merged 1 commit into from
Oct 3, 2025
Merged

[pull] master from ruby:master #322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,14 +1289,15 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
{
volatile int result = -1;
rb_thread_t *th = rb_ec_thread_ptr(ec);
const rb_namespace_t *ns = rb_loading_namespace();
volatile const struct {
VALUE wrapper, self, errinfo;
rb_execution_context_t *ec;
const rb_namespace_t *ns;
} saved = {
th->top_wrapper, th->top_self, ec->errinfo,
ec,
ec, ns,
};
const rb_namespace_t *ns = rb_loading_namespace();
enum ruby_tag_type state;
char *volatile ftptr = 0;
VALUE path;
Expand Down Expand Up @@ -1365,6 +1366,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
EC_POP_TAG();

ec = saved.ec;
ns = saved.ns;
rb_thread_t *th2 = rb_ec_thread_ptr(ec);
th2->top_self = saved.self;
th2->top_wrapper = saved.wrapper;
Expand Down