Fix for Lua 5.1 frame filter now that we separate Lua function into two types (Lua/C)

Author: WheretIB

LuaDkmDebuggerComponent/LocalComponent.cs

@@ -677,22 +677,23 @@ DkmStackWalkFrame GetLuaFunctionStackWalkFrame(ulong callInfoAddress, LuaFunctio
                             break;
 
                         var currCallLuaFunction = currCallInfoData.func as LuaValueDataLuaFunction;
+                        var currCallExternalClosure = currCallInfoData.func as LuaValueDataExternalClosure;
 
-                        Debug.Assert(currCallLuaFunction != null);
+                        Debug.Assert(currCallLuaFunction != null || currCallExternalClosure != null);
 
-                        if (currCallLuaFunction == null)
+                        if (currCallLuaFunction == null && currCallExternalClosure == null)
                             break;
 
                         var prevCallLuaFunction = prevCallInfoData.func as LuaValueDataLuaFunction;
 
                         string currFunctionName = "[name unavailable]";
 
                         // Can't get function name if calling function is unknown because of a tail call or if call was not from Lua
-                        if (currCallLuaFunction.value.isC_5_1 == 0 && currCallInfoData.tailCallCount_5_1 > 0)
+                        if (currCallInfoData.tailCallCount_5_1 > 0)
                         {
                             currFunctionName = $"[name unavailable - tail call]";
                         }
-                        else if (prevCallLuaFunction != null && prevCallLuaFunction.value.isC_5_1 != 0)
+                        else if (prevCallLuaFunction == null)
                         {
                             currFunctionName = $"[name unavailable - not called from Lua]";
                         }
@@ -705,21 +706,39 @@ DkmStackWalkFrame GetLuaFunctionStackWalkFrame(ulong callInfoAddress, LuaFunctio
                                 stateSymbols = processData.symbolStore.FetchOrCreate(stateAddress.Value);
                             }
 
-                            string functionName = stateSymbols.FetchFunctionName(currCallLuaFunction.value.functionAddress);
-
-                            if (functionName == null)
+                            if (currCallLuaFunction != null)
                             {
-                                functionName = GetLuaFunctionName(currCallInfoAddress, prevCallInfoDataAddress, currCallLuaFunction.targetAddress);
+                                string functionName = stateSymbols.FetchFunctionName(currCallLuaFunction.value.functionAddress);
+
+                                if (functionName == null)
+                                {
+                                    functionName = GetLuaFunctionName(currCallInfoAddress, prevCallInfoDataAddress, currCallLuaFunction.targetAddress);
+
+                                    if (functionName != null)
+                                        stateSymbols.AddFunctionName(currCallLuaFunction.value.functionAddress, functionName);
+                                }
 
                                 if (functionName != null)
-                                    stateSymbols.AddFunctionName(currCallLuaFunction.value.functionAddress, functionName);
+                                    currFunctionName = functionName;
                             }
+                            else if (currCallExternalClosure != null)
+                            {
+                                string functionName = stateSymbols.FetchFunctionName(currCallExternalClosure.value.functionAddress);
 
-                            if (functionName != null)
-                                currFunctionName = functionName;
+                                if (functionName == null)
+                                {
+                                    functionName = GetLuaFunctionName(currCallInfoAddress, prevCallInfoDataAddress, currCallExternalClosure.targetAddress);
+
+                                    if (functionName != null)
+                                        stateSymbols.AddFunctionName(currCallExternalClosure.value.functionAddress, functionName);
+                                }
+
+                                if (functionName != null)
+                                    currFunctionName = functionName;
+                            }
                         }
 
-                        if (currCallLuaFunction.value.isC_5_1 == 0)
+                        if (currCallLuaFunction != null)
                         {
                             stackContextData.seenLuaFrame = true;
                             stackContextData.seenFrames++;
@@ -744,7 +763,7 @@ DkmStackWalkFrame GetLuaFunctionStackWalkFrame(ulong callInfoAddress, LuaFunctio
 
                             stackContextData.seenFrames++;
 
-                            luaFrames.Add(DkmStackWalkFrame.Create(stackContext.Thread, input.InstructionAddress, input.FrameBase, input.FrameSize, luaFrameFlags, $"[{currFunctionName} C function]", input.Registers, input.Annotations));
+                            luaFrames.Add(DkmStackWalkFrame.Create(stackContext.Thread, input.InstructionAddress, input.FrameBase, input.FrameSize, luaFrameFlags, $"[{currFunctionName} C closure]", input.Registers, input.Annotations));
 
                             luaFrameFlags &= ~DkmStackWalkFrameFlags.TopFrame;
                         }