6950377855

Committed 21 Nov 2023 10:38PM UTC coverage: 88.581% (+0.01%) from 88.571%

Build # 6950377855

Build Type

push

github

Committed by

fckxorg

Commit Message

Follow-up fix for stack overflow handling cleanup.

(cherry-picked from commit aa6b15c1a)

The stack overflow error is thrown in `lj_state_growstack` only
if the coroutine status is `OK`, however, stack overflow can
happen on a yielded coroutine too. This patch fixes the condition
for status, so now the error thrown on yielded coroutines too.

Maxim Kokryashkin:
* added the description and the test for the patch

Part of tarantool/tarantool#9145

Run Details

5371 of 5981 branches covered (0.0%)

Branch coverage included in aggregate %.

1 of 1 new or added line in 1 file covered. (100.0%)

13 existing lines in 5 files now uncovered.

20609 of 23348 relevant lines covered (88.27%)

2750025.33 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

99.22

/src/lj_func.c

/*
** Function handling (prototypes, functions and upvalues).
** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
**
** Portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
*/

#define lj_func_c
#define LUA_CORE

#include "lj_obj.h"
#include "lj_gc.h"
#include "lj_func.h"
#include "lj_trace.h"
#include "lj_vm.h"

/* -- Prototypes ---------------------------------------------------------- */

void LJ_FASTCALL lj_func_freeproto(global_State *g, GCproto *pt)
{
  lj_mem_free(g, pt, pt->sizept);
}

/* -- Upvalues ------------------------------------------------------------ */

static void unlinkuv(global_State *g, GCupval *uv)
{
  UNUSED(g);
  lj_assertG(uvprev(uvnext(uv)) == uv && uvnext(uvprev(uv)) == uv,
             "broken upvalue chain");
  setgcrefr(uvnext(uv)->prev, uv->prev);
  setgcrefr(uvprev(uv)->next, uv->next);
}

/* Find existing open upvalue for a stack slot or create a new one. */
static GCupval *func_finduv(lua_State *L, TValue *slot)
{
  global_State *g = G(L);
  GCRef *pp = &L->openupval;
  GCupval *p;
  GCupval *uv;
  /* Search the sorted list of open upvalues. */
  while (gcref(*pp) != NULL && uvval((p = gco2uv(gcref(*pp)))) >= slot) {
    lj_assertG(!p->closed && uvval(p) != &p->tv, "closed upvalue in chain");
    if (uvval(p) == slot) {  /* Found open upvalue pointing to same slot? */
      if (isdead(g, obj2gco(p)))  /* Resurrect it, if it's dead. */
        flipwhite(obj2gco(p));
      return p;
    }
    pp = &p->nextgc;
  }
  /* No matching upvalue found. Create a new one. */
  uv = lj_mem_newt(L, sizeof(GCupval), GCupval);
  newwhite(g, uv);
  uv->gct = ~LJ_TUPVAL;
  uv->closed = 0;  /* Still open. */
  setmref(uv->v, slot);  /* Pointing to the stack slot. */
  /* NOBARRIER: The GCupval is new (marked white) and open. */
  setgcrefr(uv->nextgc, *pp);  /* Insert into sorted list of open upvalues. */
  setgcref(*pp, obj2gco(uv));
  setgcref(uv->prev, obj2gco(&g->uvhead));  /* Insert into GC list, too. */
  setgcrefr(uv->next, g->uvhead.next);
  setgcref(uvnext(uv)->prev, obj2gco(uv));
  setgcref(g->uvhead.next, obj2gco(uv));
  lj_assertG(uvprev(uvnext(uv)) == uv && uvnext(uvprev(uv)) == uv,
             "broken upvalue chain");
  return uv;
}

/* Create an empty and closed upvalue. */
static GCupval *func_emptyuv(lua_State *L)
{
  GCupval *uv = (GCupval *)lj_mem_newgco(L, sizeof(GCupval));
  uv->gct = ~LJ_TUPVAL;
  uv->closed = 1;
  setnilV(&uv->tv);
  setmref(uv->v, &uv->tv);
  return uv;
}

/* Close all open upvalues pointing to some stack level or above. */
void LJ_FASTCALL lj_func_closeuv(lua_State *L, TValue *level)
{
  GCupval *uv;
  global_State *g = G(L);
  while (gcref(L->openupval) != NULL &&
         uvval((uv = gco2uv(gcref(L->openupval)))) >= level) {
    GCobj *o = obj2gco(uv);
    lj_assertG(!isblack(o), "bad black upvalue");
    lj_assertG(!uv->closed && uvval(uv) != &uv->tv, "closed upvalue in chain");
    setgcrefr(L->openupval, uv->nextgc);  /* No longer in open list. */
    if (isdead(g, o)) {
      lj_func_freeuv(g, uv);
    } else {
      unlinkuv(g, uv);
      lj_gc_closeuv(g, uv);
    }
  }
}

void LJ_FASTCALL lj_func_freeuv(global_State *g, GCupval *uv)
{
  if (!uv->closed)
    unlinkuv(g, uv);
  lj_mem_freet(g, uv);
}

/* -- Functions (closures) ------------------------------------------------ */

GCfunc *lj_func_newC(lua_State *L, MSize nelems, GCtab *env)
{
  GCfunc *fn = (GCfunc *)lj_mem_newgco(L, sizeCfunc(nelems));
  fn->c.gct = ~LJ_TFUNC;
  fn->c.ffid = FF_C;
  fn->c.nupvalues = (uint8_t)nelems;
  /* NOBARRIER: The GCfunc is new (marked white). */
  setmref(fn->c.pc, &G(L)->bc_cfunc_ext);
  setgcref(fn->c.env, obj2gco(env));
  return fn;
}

static GCfunc *func_newL(lua_State *L, GCproto *pt, GCtab *env)
{
  uint32_t count;
  GCfunc *fn = (GCfunc *)lj_mem_newgco(L, sizeLfunc((MSize)pt->sizeuv));
  fn->l.gct = ~LJ_TFUNC;
  fn->l.ffid = FF_LUA;
  fn->l.nupvalues = 0;  /* Set to zero until upvalues are initialized. */
  /* NOBARRIER: Really a setgcref. But the GCfunc is new (marked white). */
  setmref(fn->l.pc, proto_bc(pt));
  setgcref(fn->l.env, obj2gco(env));
  /* Saturating 3 bit counter (0..7) for created closures. */
  count = (uint32_t)pt->flags + PROTO_CLCOUNT;
  pt->flags = (uint8_t)(count - ((count >> PROTO_CLC_BITS) & PROTO_CLCOUNT));
  return fn;
}

/* Create a new Lua function with empty upvalues. */
GCfunc *lj_func_newL_empty(lua_State *L, GCproto *pt, GCtab *env)
{
  GCfunc *fn = func_newL(L, pt, env);
  MSize i, nuv = pt->sizeuv;
  /* NOBARRIER: The GCfunc is new (marked white). */
  for (i = 0; i < nuv; i++) {
    GCupval *uv = func_emptyuv(L);
    int32_t v = proto_uv(pt)[i];
    uv->immutable = ((v / PROTO_UV_IMMUTABLE) & 1);
    uv->dhash = (uint32_t)(uintptr_t)pt ^ (v << 24);
    setgcref(fn->l.uvptr[i], obj2gco(uv));
  }
  fn->l.nupvalues = (uint8_t)nuv;
  return fn;
}

/* Do a GC check and create a new Lua function with inherited upvalues. */
GCfunc *lj_func_newL_gc(lua_State *L, GCproto *pt, GCfuncL *parent)
{
  GCfunc *fn;
  GCRef *puv;
  MSize i, nuv;
  TValue *base;
  lj_gc_check_fixtop(L);
  fn = func_newL(L, pt, tabref(parent->env));
  /* NOBARRIER: The GCfunc is new (marked white). */
  puv = parent->uvptr;
  nuv = pt->sizeuv;
  base = L->base;
  for (i = 0; i < nuv; i++) {
    uint32_t v = proto_uv(pt)[i];
    GCupval *uv;
    if ((v & PROTO_UV_LOCAL)) {
      uv = func_finduv(L, base + (v & 0xff));
      uv->immutable = ((v / PROTO_UV_IMMUTABLE) & 1);
      uv->dhash = (uint32_t)(uintptr_t)mref(parent->pc, char) ^ (v << 24);
    } else {
      uv = &gcref(puv[v])->uv;
    }
    setgcref(fn->l.uvptr[i], obj2gco(uv));
  }
  fn->l.nupvalues = (uint8_t)nuv;
  return fn;
}

void LJ_FASTCALL lj_func_free(global_State *g, GCfunc *fn)
{
  MSize size = isluafunc(fn) ? sizeLfunc((MSize)fn->l.nupvalues) :
                               sizeCfunc((MSize)fn->c.nupvalues);
  lj_mem_free(g, fn, size);
}


1	/*
2	** Function handling (prototypes, functions and upvalues).
3	** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
4	**
5	** Portions taken verbatim or adapted from the Lua interpreter.
6	** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
7	*/
8
9	#define lj_func_c
10	#define LUA_CORE
11
12	#include "lj_obj.h"
13	#include "lj_gc.h"
14	#include "lj_func.h"
15	#include "lj_trace.h"
16	#include "lj_vm.h"
17
18	/* -- Prototypes ---------------------------------------------------------- */
19
20	void LJ_FASTCALL lj_func_freeproto(global_State g, GCproto pt)	56,921✔
21	{
22	lj_mem_free(g, pt, pt->sizept);	56,921✔
23	}	56,921✔
24
25	/* -- Upvalues ------------------------------------------------------------ */
26
27	static void unlinkuv(global_State g, GCupval uv)	14,192✔
28	{
29	UNUSED(g);	14,192✔
30	lj_assertG(uvprev(uvnext(uv)) == uv && uvnext(uvprev(uv)) == uv,	14,192✔
31	"broken upvalue chain");
32	setgcrefr(uvnext(uv)->prev, uv->prev);	14,192✔
33	setgcrefr(uvprev(uv)->next, uv->next);	14,192✔
34	}	2,030✔
35
36	/* Find existing open upvalue for a stack slot or create a new one. */
37	static GCupval func_finduv(lua_State L, TValue *slot)	20,659✔
38	{
39	global_State *g = G(L);	20,659✔
40	GCRef *pp = &L->openupval;	20,659✔
41	GCupval *p;	20,659✔
42	GCupval *uv;	20,659✔
43	/* Search the sorted list of open upvalues. */
44	while (gcref(pp) != NULL && uvval((p = gco2uv(gcref(pp)))) >= slot) {	57,815✔
45	lj_assertG(!p->closed && uvval(p) != &p->tv, "closed upvalue in chain");	43,623✔
46	if (uvval(p) == slot) { /* Found open upvalue pointing to same slot? */	43,623✔
47	if (isdead(g, obj2gco(p))) /* Resurrect it, if it's dead. */	6,467✔
UNCOV 48	flipwhite(obj2gco(p));	×
49	return p;	6,467✔
50	}
51	pp = &p->nextgc;	37,156✔
52	}
53	/* No matching upvalue found. Create a new one. */
54	uv = lj_mem_newt(L, sizeof(GCupval), GCupval);	14,192✔
55	newwhite(g, uv);	14,192✔
56	uv->gct = ~LJ_TUPVAL;	14,192✔
57	uv->closed = 0; /* Still open. */	14,192✔
58	setmref(uv->v, slot); /* Pointing to the stack slot. */	14,192✔
59	/* NOBARRIER: The GCupval is new (marked white) and open. */
60	setgcrefr(uv->nextgc, pp); / Insert into sorted list of open upvalues. */	14,192✔
61	setgcref(*pp, obj2gco(uv));	14,192✔
62	setgcref(uv->prev, obj2gco(&g->uvhead)); /* Insert into GC list, too. */	14,192✔
63	setgcrefr(uv->next, g->uvhead.next);	14,192✔
64	setgcref(uvnext(uv)->prev, obj2gco(uv));	14,192✔
65	setgcref(g->uvhead.next, obj2gco(uv));	14,192✔
66	lj_assertG(uvprev(uvnext(uv)) == uv && uvnext(uvprev(uv)) == uv,	14,192✔
67	"broken upvalue chain");
68	return uv;	14,192✔
69	}
70
71	/* Create an empty and closed upvalue. */
72	static GCupval func_emptyuv(lua_State L)	5✔
73	{
74	GCupval uv = (GCupval )lj_mem_newgco(L, sizeof(GCupval));	10✔
75	uv->gct = ~LJ_TUPVAL;	5✔
76	uv->closed = 1;	5✔
77	setnilV(&uv->tv);	5✔
78	setmref(uv->v, &uv->tv);	5✔
79	return uv;	5✔
80	}
81
82	/* Close all open upvalues pointing to some stack level or above. */
83	void LJ_FASTCALL lj_func_closeuv(lua_State L, TValue level)	43,240✔
84	{
85	GCupval *uv;	43,240✔
86	global_State *g = G(L);	43,240✔
87	while (gcref(L->openupval) != NULL &&	55,412✔
88	uvval((uv = gco2uv(gcref(L->openupval)))) >= level) {	51,952✔
89	GCobj *o = obj2gco(uv);	12,172✔
90	lj_assertG(!isblack(o), "bad black upvalue");	12,172✔
91	lj_assertG(!uv->closed && uvval(uv) != &uv->tv, "closed upvalue in chain");	12,172✔
92	setgcrefr(L->openupval, uv->nextgc); /* No longer in open list. */	12,172✔
93	if (isdead(g, o)) {	12,172✔
94	lj_func_freeuv(g, uv);	10✔
95	} else {
96	unlinkuv(g, uv);	12,162✔
97	lj_gc_closeuv(g, uv);	12,162✔
98	}
99	}
100	}	43,240✔
101
102	void LJ_FASTCALL lj_func_freeuv(global_State g, GCupval uv)	14,007✔
103	{
104	if (!uv->closed)	14,007✔
105	unlinkuv(g, uv);	2,030✔
106	lj_mem_freet(g, uv);	14,007✔
107	}	14,007✔
108
109	/* -- Functions (closures) ------------------------------------------------ */
110
111	GCfunc lj_func_newC(lua_State L, MSize nelems, GCtab *env)	53,764✔
112	{
113	GCfunc fn = (GCfunc )lj_mem_newgco(L, sizeCfunc(nelems));	53,764✔
114	fn->c.gct = ~LJ_TFUNC;	53,764✔
115	fn->c.ffid = FF_C;	53,764✔
116	fn->c.nupvalues = (uint8_t)nelems;	53,764✔
117	/* NOBARRIER: The GCfunc is new (marked white). */
118	setmref(fn->c.pc, &G(L)->bc_cfunc_ext);	53,764✔
119	setgcref(fn->c.env, obj2gco(env));	53,764✔
120	return fn;	53,764✔
121	}
122
123	static GCfunc func_newL(lua_State L, GCproto pt, GCtab env)	1,089,048✔
124	{
125	uint32_t count;	1,089,048✔
126	GCfunc fn = (GCfunc )lj_mem_newgco(L, sizeLfunc((MSize)pt->sizeuv));	1,089,048✔
127	fn->l.gct = ~LJ_TFUNC;	1,089,048✔
128	fn->l.ffid = FF_LUA;	1,089,048✔
129	fn->l.nupvalues = 0; /* Set to zero until upvalues are initialized. */	1,089,048✔
130	/* NOBARRIER: Really a setgcref. But the GCfunc is new (marked white). */
131	setmref(fn->l.pc, proto_bc(pt));	1,089,048✔
132	setgcref(fn->l.env, obj2gco(env));	1,089,048✔
133	/* Saturating 3 bit counter (0..7) for created closures. */
134	count = (uint32_t)pt->flags + PROTO_CLCOUNT;	1,089,048✔
135	pt->flags = (uint8_t)(count - ((count >> PROTO_CLC_BITS) & PROTO_CLCOUNT));	1,089,048✔
136	return fn;	1,089,048✔
137	}
138
139	/* Create a new Lua function with empty upvalues. */
140	GCfunc lj_func_newL_empty(lua_State L, GCproto pt, GCtab env)	42,329✔
141	{
142	GCfunc *fn = func_newL(L, pt, env);	42,329✔
143	MSize i, nuv = pt->sizeuv;	42,329✔
144	/* NOBARRIER: The GCfunc is new (marked white). */
145	for (i = 0; i < nuv; i++) {	42,334✔
146	GCupval *uv = func_emptyuv(L);	5✔
147	int32_t v = proto_uv(pt)[i];	5✔
148	uv->immutable = ((v / PROTO_UV_IMMUTABLE) & 1);	5✔
149	uv->dhash = (uint32_t)(uintptr_t)pt ^ (v << 24);	5✔
150	setgcref(fn->l.uvptr[i], obj2gco(uv));	5✔
151	}
152	fn->l.nupvalues = (uint8_t)nuv;	42,329✔
153	return fn;	42,329✔
154	}
155
156	/* Do a GC check and create a new Lua function with inherited upvalues. */
157	GCfunc lj_func_newL_gc(lua_State L, GCproto pt, GCfuncL parent)	1,046,719✔
158	{
159	GCfunc *fn;	1,046,719✔
160	GCRef *puv;	1,046,719✔
161	MSize i, nuv;	1,046,719✔
162	TValue *base;	1,046,719✔
163	lj_gc_check_fixtop(L);	1,046,719✔
164	fn = func_newL(L, pt, tabref(parent->env));	1,046,719✔
165	/* NOBARRIER: The GCfunc is new (marked white). */
166	puv = parent->uvptr;	1,046,719✔
167	nuv = pt->sizeuv;	1,046,719✔
168	base = L->base;	1,046,719✔
169	for (i = 0; i < nuv; i++) {	1,071,030✔
170	uint32_t v = proto_uv(pt)[i];	24,311✔
171	GCupval *uv;	24,311✔
172	if ((v & PROTO_UV_LOCAL)) {	24,311✔
173	uv = func_finduv(L, base + (v & 0xff));	20,659✔
174	uv->immutable = ((v / PROTO_UV_IMMUTABLE) & 1);	20,659✔
175	uv->dhash = (uint32_t)(uintptr_t)mref(parent->pc, char) ^ (v << 24);	20,659✔
176	} else {
177	uv = &gcref(puv[v])->uv;	3,652✔
178	}
179	setgcref(fn->l.uvptr[i], obj2gco(uv));	24,311✔
180	}
181	fn->l.nupvalues = (uint8_t)nuv;	1,046,719✔
182	return fn;	1,046,719✔
183	}
184
185	void LJ_FASTCALL lj_func_free(global_State g, GCfunc fn)	1,140,363✔
186	{
187	MSize size = isluafunc(fn) ? sizeLfunc((MSize)fn->l.nupvalues) :	1,140,363✔
188	sizeCfunc((MSize)fn->c.nupvalues);	51,642✔
189	lj_mem_free(g, fn, size);	1,140,363✔
190	}	1,140,363✔
191

tarantool / luajit / 6950377855

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous