rb_bug shouldn't assume ec is available (don't use GET_EC())

luke-gruber · jhawthorn · commit d869164124cf · 2025-09-24T10:41:04.000-07:00
ec is unavailable on timer thread, for instance.
diff --git a/error.c b/error.c
@@ -1090,7 +1090,7 @@ rb_bug_without_die_internal(const char *fmt, va_list args)
     const char *file = NULL;
     int line = 0;
 
-    if (GET_EC()) {
+    if (rb_current_execution_context(false)) {
         file = rb_source_location_cstr(&line);
     }
 
@@ -1123,7 +1123,7 @@ rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const voi
     const char *file = NULL;
     int line = 0;
 
-    if (GET_EC()) {
+    if (rb_current_execution_context(false)) {
         file = rb_source_location_cstr(&line);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1090,7 +1090,7 @@ rb_bug_without_die_internal(const char *fmt, va_list args)`
`1090`	`1090`	`const char *file = NULL;`
`1091`	`1091`	`int line = 0;`
`1092`	`1092`
`1093`		`- if (GET_EC()) {`
	`1093`	`+ if (rb_current_execution_context(false)) {`
`1094`	`1094`	`file = rb_source_location_cstr(&line);`
`1095`	`1095`	`}`
`1096`	`1096`
`@@ -1123,7 +1123,7 @@ rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const voi`
`1123`	`1123`	`const char *file = NULL;`
`1124`	`1124`	`int line = 0;`
`1125`	`1125`
`1126`		`- if (GET_EC()) {`
	`1126`	`+ if (rb_current_execution_context(false)) {`
`1127`	`1127`	`file = rb_source_location_cstr(&line);`
`1128`	`1128`	`}`
`1129`	`1129`