From 6339ac02acdc2f96b1ac3d9a7562fcfafec478cc Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 16 Nov 2015 08:40:42 +0000 Subject: compile.c: optimize leave * compile.c (iseq_peephole_optimize): optimize replaced leave instruction copied to jump instruction too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ compile.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 811ba85d77..0722072129 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 16 17:40:39 2015 Nobuyoshi Nakada + + * compile.c (iseq_peephole_optimize): optimize replaced leave + instruction copied to jump instruction too. + Mon Nov 16 16:39:38 2015 Akinori MUSHA * lib/set.rb: Enable frozen_string_literal. diff --git a/compile.c b/compile.c index c34126a3c1..ce0b932c81 100644 --- a/compile.c +++ b/compile.c @@ -1956,7 +1956,8 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal unref_destination(iobj); REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj); INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj); - iobj = popiobj; + iobj = eiobj; + goto again; } /* * useless jump elimination (if/unless destination): -- cgit v1.2.3