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 7F0646522B6; Wed, 4 Oct 2023 15:50:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7F0646522B6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1696423831; bh=QBsiIzTaNT/0JnWelwfSBZsj3d1GeWAuGJzKEJOFaD0=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ao27ZoBr8megpknyVCpnsWDygYGFRWy3USn9hsTLRscaITeG1apTlnco9lmrCwVYu /NFKH7pCeX8A1rqY0HLYSLZUHlS9hci4J7yQxImCc6vws1IoUtc07oJrZM28sPkYr7 YKoGlJwL4PnPaSIRvTESvT51w552XQIse6Yr2Qfg= Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C55C4651CF0 for ; Wed, 4 Oct 2023 15:50:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C55C4651CF0 Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5056ca2b6d1so1122698e87.1 for ; Wed, 04 Oct 2023 05:50:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696423830; x=1697028630; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tIFcWU3x0+jU7fVsXRJ5K0cAvOgThkCRBZ51SYKHgCU=; b=ZF6s6G0GOWQdrOjlq6ml58fUq/5yDLuHAi3ODxrhVdHjr/gaXq5dUKCdIUImIMiICP rEJf3FID6EnR4uZYLJzbL1Sxm3DcRViB/er3b88BbOrZKlCj9oTNQ65FveRjwhUF4bue SV6RRR09vwlNHdb7pEZ6GTErJdY1pICnn0qUOLKLtNna5TOfO4aQKC5VOzsdnKjLX9Ep gbOQ4WXzGGxbfSDieCd/Wdvh2l+IedBgETOcyHy6eP0+XnnKcgDwkzV6DxbfZ9DlSgtY IU/E8Y2CaNeoLicrbwS4uX321ZotGGK+5yetAQSp6Ve2NpK8gmU/4TcAzUm3sLMrHvLc jqLw== X-Gm-Message-State: AOJu0Yw0E/YfU768i6LEgI6eCMg683chBNllAVuzx64VAA4tEaMHZ9uh /7K8+PqKZL2C5dwMT7Ow0O/zMK6eFc40vQ== X-Google-Smtp-Source: AGHT+IE7dQJ7gKDyNBSdvfBkVZgnI//raHRlxwvgDQOUigG/1usoLaZuUjNI/FmDUsIrYOpD5mPRfA== X-Received: by 2002:a05:6512:2828:b0:503:962:b6cf with SMTP id cf40-20020a056512282800b005030962b6cfmr2422958lfb.9.1696423829446; Wed, 04 Oct 2023 05:50:29 -0700 (PDT) Received: from localhost.localdomain ([185.205.79.32]) by smtp.gmail.com with ESMTPSA id r11-20020a19ac4b000000b0050482f5e36esm583077lfc.77.2023.10.04.05.50.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Oct 2023 05:50:28 -0700 (PDT) To: tarantool-patches@dev.tarantool.org, sergeyb@tarantool.org, skaplun@tarantool.org, m.kokryashkin@tarantool.org Cc: Maksim Kokryashkin Date: Wed, 4 Oct 2023 15:50:22 +0300 Message-Id: <20231004125024.64049-1-max.kokryashkin@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v3 0/2] Fix snapshot PC when linking to BC_JLOOP that was a BC_RET*. 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: Maksim Kokryashkin via Tarantool-patches Reply-To: Maksim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Changes in v3: - Fixed comments as per review by Sergey - The patch was split into two, so the test case becomes easier to implement since it can now depend on this assertion instead of memory layout. Branch: https://github.com/tarantool/luajit/tree/fckxorg/lj-624-jloop-snapshot-pc PR: https://github.com/tarantool/tarantool/pull/9166 Issue: https://github.com/luajit/luajit/issues/624 Mike Pall (2): snap: check J->pc is within its proto bytecode Fix snapshot PC when linking to BC_JLOOP that was a BC_RET*. src/lj_record.c | 9 +- src/lj_snap.c | 3 + .../lj-624-jloop-snapshot-pc.test.lua | 84 +++++++++++++++++++ 3 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua -- 2.39.3 (Apple Git-145)