Combine mainLoop/mainLoopWithContext to inline evalInstruction

Author: serprex

_state.go

@@ -576,7 +576,6 @@ func newLState(options Options) *LState {
 		wrapped:      false,
 		uvcache:      nil,
 		hasErrorFunc: false,
-		mainLoop:     mainLoop,
 		ctx:          nil,
 	}
 	if options.MinimizeStackMemory {
@@ -1051,9 +1050,9 @@ func (ls *LState) callR(nargs, nret, rbase int) {
 	if ls.G.MainThread == nil {
 		ls.G.MainThread = ls
 		ls.G.CurrentThread = ls
-		ls.mainLoop(ls, nil)
+		mainLoop(ls, nil)
 	} else {
-		ls.mainLoop(ls, ls.currentFrame)
+		mainLoop(ls, ls.currentFrame)
 	}
 	if nret != MultRet {
 		ls.reg.SetTop(rbase + nret)
@@ -1404,7 +1403,6 @@ func (ls *LState) NewThread() (*LState, context.CancelFunc) {
 	thread.Env = ls.Env
 	var f context.CancelFunc = nil
 	if ls.ctx != nil {
-		thread.mainLoop = mainLoopWithContext
 		thread.ctx, f = context.WithCancel(ls.ctx)
 		thread.ctxCancelFn = f
 	}
@@ -2044,9 +2042,8 @@ func (ls *LState) SetMx(mx int) {
 	}()
 }
 
-// SetContext set a context ctx to this LState. The provided ctx must be non-nil.
+// SetContext set a context ctx to this LState.
 func (ls *LState) SetContext(ctx context.Context) {
-	ls.mainLoop = mainLoopWithContext
 	ls.ctx = ctx
 }
 
@@ -2058,7 +2055,6 @@ func (ls *LState) Context() context.Context {
 // RemoveContext removes the context associated with this LState and returns this context.
 func (ls *LState) RemoveContext() context.Context {
 	oldctx := ls.ctx
-	ls.mainLoop = mainLoop
 	ls.ctx = nil
 	return oldctx
 }

_vm.go

@@ -540,44 +540,16 @@ func mainLoop(L *LState, baseframe *callFrame) {
 		return
 	}
 
-	for {
+	for L.ctx == nil || L.ctx.Err() == nil {
 		cf = L.currentFrame
 		inst = cf.Fn.Proto.Code[cf.Pc]
 		cf.Pc++
 		if evalInstruction(L, inst, baseframe) {
 			return
 		}
 	}
-}
-
-func mainLoopWithContext(L *LState, baseframe *callFrame) {
-	var inst uint32
-	var cf *callFrame
-
-	if L.stack.IsEmpty() {
-		return
-	}
-
-	L.currentFrame = L.stack.Last()
-	if L.currentFrame.Fn.IsG {
-		callGFunction(L, false)
-		return
-	}
 
-	for {
-		cf = L.currentFrame
-		inst = cf.Fn.Proto.Code[cf.Pc]
-		cf.Pc++
-		select {
-		case <-L.ctx.Done():
-			L.RaiseError(L.ctx.Err().Error())
-			return
-		default:
-			if evalInstruction(L, inst, baseframe) {
-				return
-			}
-		}
-	}
+	L.RaiseError(L.ctx.Err().Error())
 }
 
 // regv is the first target register to copy the return values to.
@@ -677,7 +649,7 @@ func threadRun(L *LState) {
 			}
 		}
 	}()
-	L.mainLoop(L, nil)
+	mainLoop(L, nil)
 }
 
 func luaModulo(lhs, rhs LNumber) LNumber {

state.go

@@ -675,7 +675,6 @@ func newLState(options Options) *LState {
 		wrapped:      false,
 		uvcache:      nil,
 		hasErrorFunc: false,
-		mainLoop:     mainLoop,
 		ctx:          nil,
 	}
 	if options.MinimizeStackMemory {
@@ -1263,9 +1262,9 @@ func (ls *LState) callR(nargs, nret, rbase int) {
 	if ls.G.MainThread == nil {
 		ls.G.MainThread = ls
 		ls.G.CurrentThread = ls
-		ls.mainLoop(ls, nil)
+		mainLoop(ls, nil)
 	} else {
-		ls.mainLoop(ls, ls.currentFrame)
+		mainLoop(ls, ls.currentFrame)
 	}
 	if nret != MultRet {
 		ls.reg.SetTop(rbase + nret)
@@ -1616,7 +1615,6 @@ func (ls *LState) NewThread() (*LState, context.CancelFunc) {
 	thread.Env = ls.Env
 	var f context.CancelFunc = nil
 	if ls.ctx != nil {
-		thread.mainLoop = mainLoopWithContext
 		thread.ctx, f = context.WithCancel(ls.ctx)
 		thread.ctxCancelFn = f
 	}
@@ -2256,9 +2254,8 @@ func (ls *LState) SetMx(mx int) {
 	}()
 }
 
-// SetContext set a context ctx to this LState. The provided ctx must be non-nil.
+// SetContext set a context ctx to this LState.
 func (ls *LState) SetContext(ctx context.Context) {
-	ls.mainLoop = mainLoopWithContext
 	ls.ctx = ctx
 }
 
@@ -2270,7 +2267,6 @@ func (ls *LState) Context() context.Context {
 // RemoveContext removes the context associated with this LState and returns this context.
 func (ls *LState) RemoveContext() context.Context {
 	oldctx := ls.ctx
-	ls.mainLoop = mainLoop
 	ls.ctx = nil
 	return oldctx
 }

value.go

@@ -192,7 +192,6 @@ type LState struct {
 	wrapped      bool
 	uvcache      *Upvalue
 	hasErrorFunc bool
-	mainLoop     func(*LState, *callFrame)
 	ctx          context.Context
 	ctxCancelFn  context.CancelFunc
 }

vm.go

@@ -1825,44 +1825,16 @@ func mainLoop(L *LState, baseframe *callFrame) {
 		return
 	}
 
-	for {
+	for L.ctx == nil || L.ctx.Err() == nil {
 		cf = L.currentFrame
 		inst = cf.Fn.Proto.Code[cf.Pc]
 		cf.Pc++
 		if evalInstruction(L, inst, baseframe) {
 			return
 		}
 	}
-}
-
-func mainLoopWithContext(L *LState, baseframe *callFrame) {
-	var inst uint32
-	var cf *callFrame
-
-	if L.stack.IsEmpty() {
-		return
-	}
-
-	L.currentFrame = L.stack.Last()
-	if L.currentFrame.Fn.IsG {
-		callGFunction(L, false)
-		return
-	}
 
-	for {
-		cf = L.currentFrame
-		inst = cf.Fn.Proto.Code[cf.Pc]
-		cf.Pc++
-		select {
-		case <-L.ctx.Done():
-			L.RaiseError(L.ctx.Err().Error())
-			return
-		default:
-			if evalInstruction(L, inst, baseframe) {
-				return
-			}
-		}
-	}
+	L.RaiseError(L.ctx.Err().Error())
 }
 
 // regv is the first target register to copy the return values to.
@@ -2092,7 +2064,7 @@ func threadRun(L *LState) {
 			}
 		}
 	}()
-	L.mainLoop(L, nil)
+	mainLoop(L, nil)
 }
 
 func luaModulo(lhs, rhs LNumber) LNumber {