From 703675da951a2ee317e96e51dc4ed845a71ea6ba Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 30 Jun 2017 02:09:42 +0000 Subject: compile.c: dump iseq * compile.c (append_compile_error): raise a fatal error when compile_debug is enabled. * compile.c (COMPILE_ERROR): dump the disassembled instruction instruction sequence always. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/compile.c b/compile.c index 3fa98e5d7d..f369fd593b 100644 --- a/compile.c +++ b/compile.c @@ -321,7 +321,9 @@ struct iseq_compile_data_ensure_node_stack { #define IS_INSN_ID(iobj, insn) (INSN_OF(iobj) == BIN(insn)) /* error */ -typedef void (*compile_error_func)(rb_iseq_t *, int, const char *, ...); +#if CPDEBUG > 0 +NORETURN(static void append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...)); +#endif static void append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...) @@ -341,6 +343,7 @@ append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...) else if (!err_info) { RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, Qtrue); } + if (compile_debug) rb_exc_fatal(err); } static void @@ -353,16 +356,7 @@ compile_bug(rb_iseq_t *iseq, int line, const char *fmt, ...) abort(); } -NOINLINE(static compile_error_func prepare_compile_error(rb_iseq_t *iseq)); - -static compile_error_func -prepare_compile_error(rb_iseq_t *iseq) -{ - if (compile_debug) return &compile_bug; - return &append_compile_error; -} - -#define COMPILE_ERROR prepare_compile_error(iseq) +#define COMPILE_ERROR append_compile_error #define ERROR_ARGS_AT(n) iseq, nd_line(n), #define ERROR_ARGS ERROR_ARGS_AT(node) -- cgit v1.2.3