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 217546ECCD; Sun, 31 Jul 2022 14:01:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 217546ECCD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1659265262; bh=c1MVWXIsh1de9SGHXkms+vkRY7qW4Tf4Q/szy/pWjZM=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=F2zrF8kPl1gRRNI/mf5hAur3Y/mo1SbpjjyHfqsMcRPmUNEQHtMW9DwBr3h1yAP1h g19WLUJs+6W9iU/wEldFEAbf+NsyqHbOfca/S4rhGML45AemvRP6g6nKaGqdgj4lYA 4z/Sl16d+KDjEg0tc8Rn8x4IciIynxOTm9K+HaaQ= Received: from smtp42.i.mail.ru (smtp42.i.mail.ru [94.100.177.102]) (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 2D7AB6ECCC for ; Sun, 31 Jul 2022 14:01:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2D7AB6ECCC Received: by smtp42.i.mail.ru with esmtpa (envelope-from ) id 1oI6gt-0008UN-5E; Sun, 31 Jul 2022 14:00:59 +0300 To: Sergey Ostanevich , Igor Munkin Date: Sun, 31 Jul 2022 13:58:29 +0300 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9626C4810127D4107001F7A36B58AC472FD09736E551E16CD182A05F538085040643421E7B467001837E89DCF445F2060F5B6F049DF4F479D89A175D946BAABDB X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DB84ED444C624799EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063779018AFA06A12C538638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8EA8CE72B33A2EAD32A5210B68BE8A56E117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC53F887C558D92FE4A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735209ECD01F8117BC8BEA471835C12D1D977C4224003CC836476EB9C4185024447017B076A6E789B0E975F5C1EE8F4F765FCCEA7AB636DC4604D3AA81AA40904B5D9CF19DD082D7633A078D18283394535A93AA81AA40904B5D98AA50765F7900637B5C61FC8405D26D6D81D268191BDAD3D698AB9A7B718F8C4D1B931868CE1C5781A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89FBFBFE0634520CEB9156CCFE7AF13BCA4B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C41E93BD56E7067354307CAA32FF218580205367B2BCC23E5B346B40DE2E18BD94E7E65F06B2D3BF1CAD91A466A1DEF99B6ED91DBE5ABE359A3485EE9140A7D39D7698C4407AFBD6ED360583C7422455C3F1055A48C272B0305E3BF8C76DC23F74C6CDE5D1141D2B1CB8BF439010612FB7C7659801D72FB4CBC9F8EAC3860F1059AD91A466A1DEF99B296C473AB1E14218C17D070B0FA71EBE3D58D961240FA4EF6DABF04D5057A81F1E618B5D5F965AFD2D13D82DB4E1BCE915E2725BA614EAEA1EF972C1F679AE1C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34060C3C6DE316ECE47A95B0F3ADC2231A140C1DF21924CFC54DD4F2BD7D28E7FFA601250ED20C0FB81D7E09C32AA3244C0592EDFF74974DD39F6275E6CE9B150DF522A1CF68F4BE05927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXiy2kqLce99dLhUmnji/t19 X-Mailru-Sender: 07FBBCF39629D1142254247A6196FF9B4BC638B51EA77F3D37E89DCF445F206052685D71546B8E9EDEDBA653FF35249392D99EB8CC7091A70E183A470755BFD208F19895AA18418972D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: [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: 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" 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