Merge branch 'master' into v2.1

Mike Pall · Mike Pall · commit b96d74621b63 · 2022-01-25T22:18:20.000+01:00
diff --git a/src/lj_snap.c b/src/lj_snap.c
@@ -313,7 +313,7 @@ static BCReg snap_usedef(jit_State *J, uint8_t *udf,
 }
 
 /* Mark slots used by upvalues of child prototypes as used. */
-void snap_useuv(GCproto *pt, uint8_t *udf)
+static void snap_useuv(GCproto *pt, uint8_t *udf)
 {
   /* This is a coarse check, because it's difficult to correlate the lifetime
   ** of slots and closures. But the number of false positives is quite low.

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ static BCReg snap_usedef(jit_State J, uint8_t udf,`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`/* Mark slots used by upvalues of child prototypes as used. */`
`316`		`-void snap_useuv(GCproto pt, uint8_t udf)`
	`316`	`+static void snap_useuv(GCproto pt, uint8_t udf)`
`317`	`317`	`{`
`318`	`318`	`/* This is a coarse check, because it's difficult to correlate the lifetime`
`319`	`319`	`** of slots and closures. But the number of false positives is quite low.`