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 0D62C5FC8FF; Fri, 29 Sep 2023 09:22:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0D62C5FC8FF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1695968543; 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=lcpnybHlVF1midOnlxyvtq3fTTFpK86NiOPfloWtk1rLVigqRWrF+zqhwo8sVxN/V pR2zoIkaeMn1K+YF/t+lcOPdJaZasbdPmVxRbmlLSguOuAhsLECeuehxVgLXjWzmV2 Bt6ZmtuIMB7H+68aUzbAD8rwjVK9ECzj6nd/UUSU= Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 C7AD35FC8F8 for ; Fri, 29 Sep 2023 09:20:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C7AD35FC8F8 Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-504809e4494so5988324e87.3 for ; Thu, 28 Sep 2023 23:20:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695968429; x=1696573229; 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=sS5/EiVggZJ35gCwZLAic6lwVy/f0YP6auggc1PimS0iA/L4OMPnjs9JlfxKAev4nH U9xro7NVwsj6D5Ec7PQRsMvBa3g13T/d3iRYQkNmmwI5/1v8924IpZ9P9hRJDlYqixDq ewomEqZ41B2iIU43UbToROxS+fW3dFHhs/aAGV+cqeeDJ3BIQJMmZx84twNIOj/yvHPk TbC2NRzNmpDBVjol5J/SMl+ZNkTkPCKIFXcpJzkL3nBa+9kKWLHqj+c/Tke8uvurA0rs 0ObfFIbMDwc0rf31xx1z8fsShXCttUWlxFi0WZ+Id80DZoRe7GVU1F7e2Q5Gel36v6sR zm2g== X-Gm-Message-State: AOJu0Yzhxxv2vL8Ax+noSzNbZpnOoPRV0qMt6nKQEuUGxYLheakGrVy3 xuEDyfrzC8BDj+XaJ/9pERXt2ZaITbs= X-Google-Smtp-Source: AGHT+IGnGQB10rkBRoFUg8Zus5UOvJ2AHjHMhJdWCzzZobI3ye5WLK8k2qm16XNzjRuX9vUrUGAXpw== X-Received: by 2002:a05:6512:3191:b0:4fe:8661:7696 with SMTP id i17-20020a056512319100b004fe86617696mr3301957lfe.45.1695968428555; Thu, 28 Sep 2023 23:20:28 -0700 (PDT) Received: from localhost.localdomain ([93.175.28.59]) by smtp.gmail.com with ESMTPSA id c14-20020a056512238e00b0050485bad4b4sm917717lfv.222.2023.09.28.23.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 23:20:28 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Date: Fri, 29 Sep 2023 09:20:13 +0300 Message-ID: <812309cea46ed99abe2c440aad223988c8838297.1695968227.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 v2 4/5] 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