Port some more code to x64

syzygy/agent/common/stack_capture.h

Index: syzygy/agent/common/stack_capture.h
diff --git a/syzygy/agent/common/stack_capture.h b/syzygy/agent/common/stack_capture.h
index 294dcb708e0cd7a7bd6ba7c4a3a8ff75359c5e50..31b7d3f6dedf66031aab4c63def3b42292af1484 100644
--- a/syzygy/agent/common/stack_capture.h
+++ b/syzygy/agent/common/stack_capture.h
@@ -21,7 +21,7 @@
 #include <windows.h>
 
 #include "base/logging.h"
-#include "syzygy/agent/common/stack_walker_x86.h"
+#include "syzygy/agent/common/stack_walker.h"
 #include "syzygy/common/asan_parameters.h"
 
 namespace agent {
@@ -221,7 +221,7 @@ __forceinline StackId StackCapture::StartStackId() {
 // static
 __forceinline StackId StackCapture::UpdateStackId(StackId stack_id,
                                                   const void* frame) {
-  stack_id += reinterpret_cast<StackId>(frame);
+  stack_id += static_cast<StackId>(reinterpret_cast<uintptr_t>(frame));
   stack_id += stack_id << 10;
   stack_id ^= stack_id >> 6;
   return stack_id;