diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-06-07 13:07:11 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-06-07 13:29:08 +0900 |
| commit | b9f771dc50653451d945154671f529903a329033 (patch) | |
| tree | 7b8104ec13567c38c3824734a8908aac7b81321d /mrbgems/mruby-compiler/core/codegen.c | |
| parent | fc7096f18ac48fd92323ea75b8ee541748bff78b (diff) | |
| download | mruby-b9f771dc50653451d945154671f529903a329033.tar.gz mruby-b9f771dc50653451d945154671f529903a329033.zip | |
Handles exceptions from code generation phase; fix #3695
Diffstat (limited to 'mrbgems/mruby-compiler/core/codegen.c')
| -rw-r--r-- | mrbgems/mruby-compiler/core/codegen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 174be4196..daf6100a3 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -2993,6 +2993,7 @@ mrb_generate_code(mrb_state *mrb, parser_state *p) { codegen_scope *scope = scope_new(mrb, 0, 0); struct RProc *proc; + struct mrb_jmpbuf *prev_jmp = mrb->jmp; if (!scope) { return NULL; @@ -3003,17 +3004,20 @@ mrb_generate_code(mrb_state *mrb, parser_state *p) scope->filename_index = p->current_filename_index; MRB_TRY(&scope->jmp) { + mrb->jmp = &scope->jmp; /* prepare irep */ codegen(scope, p->tree, NOVAL); proc = mrb_proc_new(mrb, scope->irep); mrb_irep_decref(mrb, scope->irep); mrb_pool_close(scope->mpool); proc->c = NULL; + mrb->jmp = prev_jmp; return proc; } MRB_CATCH(&scope->jmp) { mrb_irep_decref(mrb, scope->irep); mrb_pool_close(scope->mpool); + mrb->jmp = prev_jmp; return NULL; } MRB_END_EXC(&scope->jmp); |