From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 971B563DBBD; Fri, 15 Sep 2023 16:25:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 971B563DBBD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1694784301; bh=15CA4fI+jst6uLzZqhIHGv1C4xj7AJd5qbN4EU8UKQE=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=IQN46qR+CeCUSAeEYcOQIZrqb1GTqmXYSPvHUN1PmSjxeiZ9ZJ1JikNIHnI7tKZZW t1tJZWfo0rDSZbT92zqC1tA1ElT7MvWBfZqsU6OWaw1Rvok+vOv2PY6Ez62e4nmLD7 CE9mdojgoIEjWs3HhlZX/EtT9K11FBdDCCqNQT3s= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 16122495D01 for ; Fri, 15 Sep 2023 16:25:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 16122495D01 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1qh8od-00043g-7T; Fri, 15 Sep 2023 16:24:59 +0300 Date: Fri, 15 Sep 2023 16:20:20 +0300 To: Sergey Bronnikov Message-ID: References: <20230829095440.30540-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9FD052C19707CBA10A107557D5B07C3B24168398A62115A0400894C459B0CD1B9DE34A7E353532B4A0EB5467B25CC84116523283FD62C3BE4E6C35C6253E650BB X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE757AEC41D7AA04458EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373C710FAF3667BB888638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8C38E617A85634C715683FDEF6831A12D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC974A882099E279BDA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8B974A882099E279BDAAAE862A0553A39223F8577A6DFFEA7CE81301DE8022F8F643847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A5087D4910311E0A48F9569F8FCDF63FE93B37F5CE35331081F87CCE6106E1FC07E67D4AC08A07B9B00A6B3CD6EB70C818BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADBF74143AD284FC7177DD89D51EBB7742424CF958EAFF5D571004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D348B532EA2091F4FF6A14B714BC77CECB8E3DD2FB39D365A3A737A846F33B0B764F3FCEB9875AB851C1D7E09C32AA3244C66F07F8814513E7604AF0A9EA659AC67F165894D92D6270685A42E4C463514DC5DA084F8E80FEBD3202CD0F03380D9577A83BD0C44CE203720ABEDE4BBDD9CDD X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojYiMmPA/XhkVHq0cG4eSYuQ== X-DA7885C5: 308DD07F9E7AE08FA12A37CC78133A9048C9D755D790DD5E749F9BA6BE84C825262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F73930F533AC2B33E986BCE00B11DFA1D4EFBE21290924541397A0FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] Fix handling of instable types in TNEW/TDUP load forwarding. X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! Thanks for the review! Fixed your comment, and force-pushed the branch. On 15.09.23, Sergey Bronnikov wrote: > Hi, Sergey > > thanks for the patch! LGTM > > And see my minor comments below. > > > On 8/29/23 12:54, Sergey Kaplun wrote: > > > > > -- TDUP. > > ---[[ > > --- FIXME: Disable test case for now. Enable, with another > > --- backported commit with a fix for the aforementioned issue > > --- (and after patch "Improve assertions."). > > --- Test taken trace exits too. > > for _ = 1, 5 do > > local t = slot > > -- Now use constant key slot to get necessary branch. > > @@ -48,6 +43,5 @@ for _ = 1, 5 do > Nit: assert is triggered with 3 iterations too Yes, but I also want to test the trace execution. So, left it as is. > > slot = _ % 2 ~= 0 and stored_tab or {true} > Nit: I would left a comment with explanation why exactly this value is > assigned to slot. Added the corresponding comment. =================================================================== diff --git a/test/tarantool-tests/lj-994-instable-types-during-loop-unroll.test.lua b/test/tarantool-tests/lj-994-instable-types-during-loop-unroll.test.lua index 6e2cf5ed..f240bdd2 100644 --- a/test/tarantool-tests/lj-994-instable-types-during-loop-unroll.test.lua +++ b/test/tarantool-tests/lj-994-instable-types-during-loop-unroll.test.lua @@ -40,6 +40,8 @@ for _ = 1, 5 do -- LJ_TRERR_GFAIL isn't triggered here. -- See `fwd_ahload()` in for details. result = t[1] + -- The constant table should contain the key with a different + -- type. slot = _ % 2 ~= 0 and stored_tab or {true} end test:is(result, true, 'TDUP load forwarding was successful') =================================================================== > > end > > test:is(result, true, 'TDUP load forwarding was successful') > > -]] > > > > test:done(true) -- Best regards, Sergey Kaplun