From bf5076eb010a0c8928d7fb823b35105e9e9dc0c6 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Tue, 2 Aug 2022 23:05:45 -0700
Subject: [PATCH] crypto/sha1: add real workaround for msvc/arm64 bad codegen

---
 Source/Core/Common/CMakeLists.txt  | 8 ++++++++
 Source/Core/Common/Crypto/SHA1.cpp | 4 ----
 Source/Core/DolphinLib.props       | 7 ++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 8cf550a886..134d38062c 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -136,6 +136,14 @@ add_library(common
   WorkQueueThread.h
 )
 
+if(MSVC AND _M_ARM_64)
+  # Workaround msvc arm64 optimizer bug
+  # TODO remove after updating to VS 17.4
+  set_source_files_properties(
+    Crypto/SHA1.cpp
+    PROPERTIES COMPILE_FLAGS "/d2ssa-peeps-post-color-")
+endif()
+
 if(NOT MSVC AND _M_ARM_64)
   set_source_files_properties(
     Crypto/AES.cpp
diff --git a/Source/Core/Common/Crypto/SHA1.cpp b/Source/Core/Common/Crypto/SHA1.cpp
index 7dfbb1f0c0..8f22855b0e 100644
--- a/Source/Core/Common/Crypto/SHA1.cpp
+++ b/Source/Core/Common/Crypto/SHA1.cpp
@@ -293,10 +293,6 @@ private:
   template <size_t Func>
   static inline constexpr State FourRounds(State state, uint32x4_t w)
   {
-#ifdef _MSC_VER
-    // FIXME it seems the msvc optimizer gets a little too happy
-    _ReadBarrier();
-#endif
     return {f<Func>(state, w), vsha1h_u32(vgetq_lane_u32(state.abcd, 0))};
   }
 
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 0c73e3d980..b1da315c18 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -723,7 +723,12 @@
     <ClCompile Include="Common\Crypto\AES.cpp" />
     <ClCompile Include="Common\Crypto\bn.cpp" />
     <ClCompile Include="Common\Crypto\ec.cpp" />
-    <ClCompile Include="Common\Crypto\SHA1.cpp" />
+    <ClCompile Include="Common\Crypto\SHA1.cpp">
+      <!--Workaround msvc arm64 optimizer bug
+      TODO remove after updating to VS 17.4
+      -->
+      <AdditionalOptions Condition="'$(Platform)'=='ARM64'">/d2ssa-peeps-post-color- %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <ClCompile Include="Common\Debug\MemoryPatches.cpp" />
     <ClCompile Include="Common\Debug\Watches.cpp" />
     <ClCompile Include="Common\DynamicLibrary.cpp" />