[MERGE #6359 @pleath] Fixing ARM64 build issue

pleath · pleath · commit 9741bdff2b17 · 2019-12-20T10:25:33.000-08:00
Merge pull request #6359 from pleath:arm64build
diff --git a/lib/Runtime/Base/ThreadContextInfo.cpp b/lib/Runtime/Base/ThreadContextInfo.cpp
@@ -493,7 +493,7 @@ ThreadContextInfo::SetValidCallTargetInternal(
 #endif
             )
         {
-            _guard_check_icall((uintptr_t)callTargetAddress);
+            _GUARD_CHECK_ICALL((uintptr_t)callTargetAddress);
         }
 
         if (PHASE_TRACE1(Js::CFGPhase))
diff --git a/lib/Runtime/Base/ThreadContextInfo.h b/lib/Runtime/Base/ThreadContextInfo.h
@@ -174,3 +174,6 @@ uintptr_t ShiftAddr(const ThreadContextInfo*const context, T* address)
 
 uintptr_t ShiftAddr(const ThreadContextInfo*const context, uintptr_t address);
 
+#ifndef _GUARD_CHECK_ICALL
+#define _GUARD_CHECK_ICALL _guard_check_icall
+#endif

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ ThreadContextInfo::SetValidCallTargetInternal(`
`493`	`493`	`#endif`
`494`	`494`	`)`
`495`	`495`	`{`
`496`		`- _guard_check_icall((uintptr_t)callTargetAddress);`
	`496`	`+ _GUARD_CHECK_ICALL((uintptr_t)callTargetAddress);`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`if (PHASE_TRACE1(Js::CFGPhase))`