From owner-svn-ports-all@freebsd.org Fri May 3 11:50:25 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A76F8158D39C; Fri, 3 May 2019 11:50:25 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5105F6D8E2; Fri, 3 May 2019 11:50:25 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AAA420404; Fri, 3 May 2019 11:50:25 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x43BoP93083758; Fri, 3 May 2019 11:50:25 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x43BoOZf083756; Fri, 3 May 2019 11:50:24 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201905031150.x43BoOZf083756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 3 May 2019 11:50:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500722 - in head/lang/lua53: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/lang/lua53: . files X-SVN-Commit-Revision: 500722 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5105F6D8E2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 May 2019 11:50:25 -0000 Author: swills Date: Fri May 3 11:50:24 2019 New Revision: 500722 URL: https://svnweb.freebsd.org/changeset/ports/500722 Log: lang/lua53: move assertion to correct place PR: 236891 Submitted by: andrew@tao11.riddles.org.uk Approved by: Russell Haley (maintainer) Modified: head/lang/lua53/Makefile (contents, props changed) head/lang/lua53/files/extra-patch-assert (contents, props changed) Modified: head/lang/lua53/Makefile ============================================================================== --- head/lang/lua53/Makefile Fri May 3 11:42:24 2019 (r500721) +++ head/lang/lua53/Makefile Fri May 3 11:50:24 2019 (r500722) @@ -3,7 +3,7 @@ PORTNAME= lua DISTVERSION= 5.3.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= https://www.lua.org/ftp/ PKGNAMESUFFIX= 53 Modified: head/lang/lua53/files/extra-patch-assert ============================================================================== --- head/lang/lua53/files/extra-patch-assert Fri May 3 11:42:24 2019 (r500721) +++ head/lang/lua53/files/extra-patch-assert Fri May 3 11:50:24 2019 (r500722) @@ -9,3 +9,21 @@ /* ** Allows POSIX/XSI stuff +--- src/lgc.c.orig 2017-08-31 16:15:27 UTC ++++ src/lgc.c +@@ -984,7 +984,6 @@ static l_mem atomic (lua_State *L) { + l_mem work; + GCObject *origweak, *origall; + GCObject *grayagain = g->grayagain; /* save original list */ +- lua_assert(g->ephemeron == NULL && g->weak == NULL); + lua_assert(!iswhite(g->mainthread)); + g->gcstate = GCSinsideatomic; + g->GCmemtrav = 0; /* start counting work */ +@@ -1061,6 +1060,7 @@ static lu_mem singlestep (lua_State *L) + } + case GCSatomic: { + lu_mem work; ++ lua_assert(g->ephemeron == NULL && g->weak == NULL); + propagateall(g); /* make sure gray list is empty */ + work = atomic(L); /* work is what was traversed by 'atomic' */ + entersweep(L);