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

ruby-changes:62212

From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Tue, 14 Jul 2020 16:16:52 +0900 (JST)
Subject: [ruby-changes:62212] 8d3a084572 (master): _mjit_compile_invokebuiltin: sp_inc can be negative

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

From 8d3a08457292d027070920e4fb3244445a142a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
 <shyouhei@r...>
Date: Tue, 14 Jul 2020 13:15:06 +0900
Subject: _mjit_compile_invokebuiltin: sp_inc can be negative

Was my bad to assume sp_inc was positive.  Real criteria is the
calculated sp is non-negative.  We have to assert that.

diff --git a/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb b/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
index 29a21b1..9a9e53a 100644
--- a/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
+++ b/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb#L11
 % end
         rb_snum_t sp_inc = <%= insn.call_attribute('sp_inc') %>;
         unsigned sp = b->stack_size + (unsigned)sp_inc;
-        VM_ASSERT(sp_inc >= 0);
+        VM_ASSERT(b->stack_size > -sp_inc);
         VM_ASSERT(sp_inc < UINT_MAX - b->stack_size);
 
         if (bf->compiler) {
-- 
cgit v0.10.2


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

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