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 9F05E642394; Thu, 28 Sep 2023 20:10:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9F05E642394 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1695921028; bh=1ytb81bkJTysHx2VUdb4mW0mABJfswI50tE560Pc4Aw=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=qjikbc7G18OxI1iWIELUM10Hk2kjbWZ2NdAfNuVkwLRJuSeH0Ti/P3GYO+VkU2BhB PKGCVzSLubrykl6GYtjzUWpSglISMlbJOOtOBgqTYnN3aZ3UcdNMXvnrSVotAaGn4R 2nSw2kV+eUV/3vSrdoVxWe4JGNFW92h2TdOwNiIE= 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 1794064238C for ; Thu, 28 Sep 2023 20:09:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1794064238C Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5043a01ee20so18817617e87.0 for ; Thu, 28 Sep 2023 10:09:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695920942; x=1696525742; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0pcm0G06gyS3zDWVDRLnLiMyYRSRFqkd95SLjiD48cU=; b=arRIKrR1MX4msYa1lZtt645IIfQd90T2NTtr/Vbrpepsndy3LSw+J+6JE11qdwMGm2 D/GV9tQwWgiyCNTIm/9yiO7171zya0fygc4mmv8a9nLmldy70xcdN+F5aiqmbQ3MRuVH qRTKu9D6RgkA+LO+9LAxRlXQz7Y6b0lz76WVGnrIAaOsFxcWeFx7L4LbZPOGU7/RqYvO qHCJbQ0j+iZDfR+vb6hzteTeGizy7TVKOAuW+h0f9ezDpaJiKmgg8mRd3qxw9TX4RqAq RK/vxgee4sGJ5cnJ1/6OlSwxZia0hhjOYV2XJD1T9EvSoT7gSwC84Iqlf7z0Hf1mUaMF I1pg== X-Gm-Message-State: AOJu0YwJ6zy7tOe1Wgc1ZcIOKcS+jnpt9qjg6Hop4MqYS+04mnusRoEm jobjJcEVTiBju3wOCLeNJdydMxOqFbw= X-Google-Smtp-Source: AGHT+IFQa/STHwh2YvrArhMbeAViBAi+gZJPVPF291J/0LFSs54fZySQOjwZ7GDPgsX7vDNo4B3Ofw== X-Received: by 2002:a05:6512:138e:b0:4fe:7e7f:1328 with SMTP id fc14-20020a056512138e00b004fe7e7f1328mr1768113lfb.16.1695920941858; Thu, 28 Sep 2023 10:09:01 -0700 (PDT) Received: from localhost.localdomain (95-24-2-172.broadband.corbina.ru. [95.24.2.172]) by smtp.gmail.com with ESMTPSA id bi4-20020a0565120e8400b005044911b328sm2301792lfb.218.2023.09.28.10.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 10:09:01 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Date: Thu, 28 Sep 2023 20:08:48 +0300 Message-ID: <0ef2a0778f296dcb4b815a875899c452607cd7f9.1695920642.git.m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit 3/4] Revert "Update cur_L on exceptional path (arm)" 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: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This reverts commit 5ccd25d740476a37d414733b5192d5be0ef06173. As was mentioned in tarantool/tarantool#6189, throwing an error not on the currently executed coroutine is a violation of the Lua/C API. This patch is a part of the patchset that supports this violation and is reverted because of it. Part of tarantool/tarantool#6323 --- src/vm_arm.dasc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc index 767d31f9..7095e660 100644 --- a/src/vm_arm.dasc +++ b/src/vm_arm.dasc @@ -351,7 +351,6 @@ static void build_subroutines(BuildCtx *ctx) | mv_vmstate CARG4, CFUNC | ldr GL:CARG3, L->glref | str CARG4, GL:CARG3->vmstate - | str L, GL:CARG3->cur_L | b ->vm_leave_unw | |->vm_unwind_ff: // Unwind C stack, return from ff pcall. @@ -372,7 +371,6 @@ static void build_subroutines(BuildCtx *ctx) | mv_vmstate CARG2, INTERP | str CARG1, [BASE, #-4] // Prepend false to error message. | st_vmstate CARG2 - | str L, [DISPATCH, #DISPATCH_GL(cur_L)] | b ->vm_returnc | |->vm_unwind_ext: // Complete external unwind. -- 2.42.0