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 B020F5FC8FF; Fri, 29 Sep 2023 09:21:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B020F5FC8FF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1695968512; bh=EeHwVMt3XfrhDRrmukDi7qai1hC7FSkosPeuXxFV/lg=; 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=vR2jAvE+V6pwFt/uQ4i2nycyCX1zvAyxq8PDS4qKzW5J7PB2GoyfwvoccbStjbHPl MN0MzgP2HRCeac6aNBZ5awPL5w6nRks3E0dhTA1gIu/kkMuMqqW5gOAjx7YnGXbngt VxxmhIjX6tndIqcHulIxgzcewVadoa5+7gYbgmW8= Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 6F17D5FC8F7 for ; Fri, 29 Sep 2023 09:20:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6F17D5FC8F7 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50337b43ee6so22467296e87.3 for ; Thu, 28 Sep 2023 23:20:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695968426; x=1696573226; 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=ESK25YLfDdlHTNJJfn7fnkJpUd5fBslRDoRYIhBBmXc=; b=jvYGkI+1v2If+wzeKNdofQB50w0y5dJGJCa+sT4vvbHCL1POjX9pWBiNEvCoc8hE2A uf75XQOB/IwBmJHTl7b0kZYem/Of2S9gpgWAa/PS3a9Jy9Ud+9/l1Y56tYTWqg9WDbJL Py47U7W7Wfumtd/ymHTqTCuigGpDY0rLkyD8hQcodIFp59Gp8v8RXUDt783+UpoKrM7Q 36DOpm349/1nhxBHEcEzbtC1vb8UH3T/iGXtngcDM8c94mElclbclQHtGe4XTJHw094T Nnlvwz68tORyFWoQFB+UcEbSJGxXLqtHlSrEIcmy6BsrVvnX7hAy7GMoO+M3WXG/JiKH qdFg== X-Gm-Message-State: AOJu0YwIzHpGNRBFghcQY1pWKPVAHlm++V3qEoByBqGiDEMDItzZMik5 E7HY6Rz7N8nKBFaFEhRn3R14nMWsveQ= X-Google-Smtp-Source: AGHT+IHU0sj/syotQ3C6Uz83m6DTYq+c2yA638ZJD/XYr5SaTAc937TbBk3Xi3prTVdZjyVfgZOB9g== X-Received: by 2002:a05:6512:1599:b0:500:d4d9:25b5 with SMTP id bp25-20020a056512159900b00500d4d925b5mr3456339lfb.56.1695968426442; Thu, 28 Sep 2023 23:20:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 23:20:26 -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:12 +0300 Message-ID: <6a861ad27810eab2c5fd5bc659027b5a57f6577f.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 3/5] Revert "arm64: fix cur_L restoration on error throw" 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 7570ff61138fb50a17ed78ee28dde0acbbf6131e. 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_arm64.dasc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vm_arm64.dasc b/src/vm_arm64.dasc index de33bde4..0a12b5b7 100644 --- a/src/vm_arm64.dasc +++ b/src/vm_arm64.dasc @@ -395,7 +395,6 @@ static void build_subroutines(BuildCtx *ctx) | mv_vmstate TMP0w, CFUNC | ldr GL, L->glref | st_vmstate TMP0w - | str L, GL->cur_L | b ->vm_leave_unw | |->vm_unwind_ff: // Unwind C stack, return from ff pcall. @@ -411,7 +410,6 @@ static void build_subroutines(BuildCtx *ctx) | ldr GL, L->glref // Setup pointer to global state. | mov_false TMP0 | sub RA, BASE, #8 // Results start at BASE-8. - | str L, GL->cur_L | ldr PC, [BASE, FRAME_PC] // Fetch PC of previous frame. | str TMP0, [BASE, #-8] // Prepend false to error message. | st_vmstate ST_INTERP -- 2.42.0