From 4e12051fe885f93eb5ce8eb114f6ee944b417035 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 28 Jul 2019 14:16:53 +0000
Subject: merge revision(s) a6a26e42b15c46f117f4fce07a2050e9d727355d: [Backport
 #15906]

	compile.c: Partially revert r63870 which caused wrong optimization

	[Bug #15906]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 compile.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'compile.c')

diff --git a/compile.c b/compile.c
index a23e7867aa..d6e6c8f4fa 100644
--- a/compile.c
+++ b/compile.c
@@ -2775,7 +2775,8 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	    ELEM_INSERT_NEXT(&dniobj->link, &pop->link);
 	    goto again;
 	}
-	else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
+       else if (IS_INSN(iobj->link.prev) &&
+                 (piobj = (INSN *)iobj->link.prev) &&
 		 (IS_INSN_ID(piobj, branchif) ||
 		  IS_INSN_ID(piobj, branchunless))) {
 	    INSN *pdiobj = (INSN *)get_destination_insn(piobj);
-- 
cgit v1.2.3