[前][次][番号順一覧][スレッド一覧]

ruby-changes:57489

From: Takashi <ko1@a...>
Date: Mon, 2 Sep 2019 23:40:32 +0900 (JST)
Subject: [ruby-changes:57489] ca8ae759d0 (master): Fix compilation error in SUPPORT_JOKE

https://git.ruby-lang.org/ruby.git/commit/?id=ca8ae759d0

From ca8ae759d0dee6840aa446499a9e1752f74da500 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Mon, 2 Sep 2019 23:35:51 +0900
Subject: Fix compilation error in SUPPORT_JOKE

This seems to have been broken since 4e15be8bade.

diff --git a/compile.c b/compile.c
index 6a72a87..774aced 100644
--- a/compile.c
+++ b/compile.c
@@ -6607,10 +6607,9 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in https://github.com/ruby/ruby/blob/trunk/compile.c#L6607
             }
             else {
                 COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
-                goto ng;
+                return COMPILE_NG;
             }
 
-
             if (mid == goto_id) {
                 ADD_INSNL(ret, line, jump, label);
             }
@@ -7267,7 +7266,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in https://github.com/ruby/ruby/blob/trunk/compile.c#L7266
       case NODE_QCALL: /* obj&.foo */
       case NODE_FCALL: /* foo() */
       case NODE_VCALL: /* foo (variable or call) */
-        compile_call(iseq, ret, node, type, line, popped);
+        if (compile_call(iseq, ret, node, type, line, popped) == COMPILE_NG) {
+            goto ng;
+        }
         break;
       case NODE_SUPER:
       case NODE_ZSUPER:{
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]