| commit | b988fa74ec18de6214b18f723e48331d9a7802ae | [log] [tgz] |
|---|---|---|
| author | Tom Tan <Tom.Tan@microsoft.com> | Wed Jan 02 15:06:59 2019 -0800 |
| committer | Joshua Peraza <jperaza@chromium.org> | Thu Jan 03 00:10:28 2019 +0000 |
| tree | a56412d69ca0f6b537af762fd5a96cd6a02d8d71 | |
| parent | 5467393a3d1e7ab929fd01d79971701bf4e2c2c6 [diff] |
Extract intruction pointer correctly for Windows ARM64 Bug: 893460 Change-Id: Ibbdf734e72c29c4779b6a701dceec1626056a9ba Reviewed-on: https://chromium-review.googlesource.com/c/1393763 Reviewed-by: Joshua Peraza <jperaza@chromium.org>
diff --git a/src/client/windows/handler/exception_handler.cc b/src/client/windows/handler/exception_handler.cc index c369b65..ad45b20 100644 --- a/src/client/windows/handler/exception_handler.cc +++ b/src/client/windows/handler/exception_handler.cc
@@ -976,7 +976,9 @@ #if defined(_M_IX86) exinfo->ContextRecord->Eip; #elif defined(_M_AMD64) - exinfo->ContextRecord->Rip; + exinfo->ContextRecord->Rip; +#elif defined(_M_ARM64) + exinfo->ContextRecord->Pc; #else #error Unsupported platform #endif