[MERGE #5321 @msdimitrov] Remove NvContext pointers in StackTrace64

MikeHolman · MikeHolman · commit 580a56f90f66 · 2019-06-07T12:04:28.000-07:00
Merge pull request #5321 from msdimitrov:rtl-virtual-unwind Resolves #5314
diff --git a/lib/Common/Core/FaultInjection.cpp b/lib/Common/Core/FaultInjection.cpp
@@ -117,7 +117,6 @@ namespace Js
         _In_opt_ const CONTEXT* pCtx = nullptr)
     {
         CONTEXT                         Context;
-        KNONVOLATILE_CONTEXT_POINTERS   NvContext;
         UNWIND_HISTORY_TABLE            UnwindHistoryTable;
         PRUNTIME_FUNCTION               RuntimeFunction;
         PVOID                           HandlerData;
@@ -141,7 +140,7 @@ namespace Js
         while (true)
         {
             RuntimeFunction = RtlLookupFunctionEntry(Context.Rip, &ImageBase, &UnwindHistoryTable);
-            RtlZeroMemory(&NvContext, sizeof(KNONVOLATILE_CONTEXT_POINTERS));
+
             if (!RuntimeFunction)
             {
                 Context.Rip = (ULONG64)(*(PULONG64)Context.Rsp);
@@ -150,7 +149,7 @@ namespace Js
             else
             {
                 RtlVirtualUnwind(UNW_FLAG_NHANDLER, ImageBase, Context.Rip, RuntimeFunction,
-                    &Context, &HandlerData, &EstablisherFrame, NULL);
+                    &Context, &HandlerData, &EstablisherFrame, NULL /* ContextPointers */);
             }
 
             if (!Context.Rip)

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,6 @@ namespace Js`
`117`	`117`	`_In_opt_ const CONTEXT* pCtx = nullptr)`
`118`	`118`	`{`
`119`	`119`	`CONTEXT Context;`
`120`		`- KNONVOLATILE_CONTEXT_POINTERS NvContext;`
`121`	`120`	`UNWIND_HISTORY_TABLE UnwindHistoryTable;`
`122`	`121`	`PRUNTIME_FUNCTION RuntimeFunction;`
`123`	`122`	`PVOID HandlerData;`
`@@ -141,7 +140,7 @@ namespace Js`
`141`	`140`	`while (true)`
`142`	`141`	`{`
`143`	`142`	`RuntimeFunction = RtlLookupFunctionEntry(Context.Rip, &ImageBase, &UnwindHistoryTable);`
`144`		`- RtlZeroMemory(&NvContext, sizeof(KNONVOLATILE_CONTEXT_POINTERS));`
	`143`	`+`
`145`	`144`	`if (!RuntimeFunction)`
`146`	`145`	`{`
`147`	`146`	`Context.Rip = (ULONG64)(*(PULONG64)Context.Rsp);`
`@@ -150,7 +149,7 @@ namespace Js`
`150`	`149`	`else`
`151`	`150`	`{`
`152`	`151`	`RtlVirtualUnwind(UNW_FLAG_NHANDLER, ImageBase, Context.Rip, RuntimeFunction,`
`153`		`- &Context, &HandlerData, &EstablisherFrame, NULL);`
	`152`	`+ &Context, &HandlerData, &EstablisherFrame, NULL /* ContextPointers */);`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`if (!Context.Rip)`