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 825336F156; Wed, 10 Aug 2022 17:45:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 825336F156 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1660142709; bh=z+28DG0pQn4EfitOLnanhMtY258L5Ub37hnNzxR5GdU=; 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=UEGNBlYaqley/4H+3Fyg+1qAQIjENpE0xEalwSFRApFyHoXCF21VDzUdbOdFGX6mS QPXwI1LRan2oGMn487AnJV+49/SH+aAIamkuA5d6YqjKGuhBV6OdOyc+cP2WFK0hQz 9tJhMAToenkcJ4ARNi01Ijrr6St84jqe0KMnvyOI= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 87A156F156 for ; Wed, 10 Aug 2022 17:45:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 87A156F156 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1oLmxG-0000sd-Mx; Wed, 10 Aug 2022 17:45:07 +0300 Date: Wed, 10 Aug 2022 17:35:16 +0300 To: Sergey Kaplun Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD999D8F08CF16C6CA7E7CF3CD33B5B68987F68D963F3109BD200894C459B0CD1B98C84F183C4AA0A3A9C68DEA74CCA220B1CF4F9F754251ADDCFEC41F7248C3CD5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BCC85671EC7A750CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637A521848D7B067A388638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8A6D572A230605B6A0E599314B598450E117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCA2C6A0109559C168A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735209ECD01F8117BC8BEA471835C12D1D977C4224003CC8364762BB6847A3DEAEFB0F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CD0F529D6CE73765543847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 9604B64F49C60606AD91A466A1DEF99B296C473AB1E142185AC9E3593CE4B31AB1881A6453793CE9274300E5CE05BD4401A9E91200F654B01A22A53B1D49F786F34D038AF326B0D6D0487D513A03383CBFAB3F81F35D7B6F9C2B6934AE262D3EE7EAB7254005DCED8DA55E71E02F9FC08E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A9873270276D433429F7D72DB17F048684B804D882C065CE24413F64ACD8FA9856B1A14CD8C67B221D7E09C32AA3244CE1E30546ECA4B27140766A63F7F89AB0F26BFA4C8A6946B8927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj7QltIE4ci8ITMu3LQJJOjg== X-Mailru-Sender: 689FA8AB762F7393CC2E0F076E87284E8994327F6F6F14F26B33C352778197FFA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E3365FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 0/2] Fix handling errors on snapshot restore 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, I've checked the patchset into all long-term branches in tarantool/luajit and bumped a new version in master, 2.10 and 1.10. On 31.07.22, Sergey Kaplun wrote: > Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-603-err-snap-restore-full-ci > Tarantool PR: https://github.com/tarantool/tarantool/pull/7499 > Issues: > * https://github.com/tarantool/tarantool/issues/7230 > * https://github.com/LuaJIT/LuaJIT/issues/703 > > Mike Pall (2): > Fix handling of errors during snapshot restore. > Call error function on rethrow after trace exit. > > src/lj_debug.c | 1 + > src/lj_dispatch.h | 2 +- > src/lj_err.c | 2 +- > src/lj_err.h | 2 +- > src/lj_trace.c | 4 +- > src/vm_arm.dasc | 3 +- > src/vm_mips.dasc | 5 +- > src/vm_ppc.dasc | 3 +- > src/vm_x86.dasc | 4 +- > .../lj-603-err-snap-restore.test.lua | 51 +++++++++++++++++++ > 10 files changed, 63 insertions(+), 14 deletions(-) > create mode 100644 test/tarantool-tests/lj-603-err-snap-restore.test.lua > > -- > 2.34.1 > -- Best regards, IM