svn commit: r500722 - in head/lang/lua53: . files

[Steve Wills]

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 at tao11.riddles.org.uk
  Approved by:	Russell Haley <russ.haley at gmail.com> (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);