Android #141

query_cache: demote report synced unreachable to assert

README.md

@@ -1,10 +1,8 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
 | [11535](https://github.com/yuzu-emu/yuzu//pull/11535) | [`50bcfa5fb`](https://github.com/yuzu-emu/yuzu//pull/11535/files) | renderer_vulkan: Introduce separate cmd buffer for uploads | [GPUCode](https://github.com/GPUCode/) | Yes |
-| [12074](https://github.com/yuzu-emu/yuzu//pull/12074) | [`ed9d19cb4`](https://github.com/yuzu-emu/yuzu//pull/12074/files) | Implement Native Code Execution (NCE) | [GPUCode](https://github.com/GPUCode/) | Yes |
+| [12074](https://github.com/yuzu-emu/yuzu//pull/12074) | [`dc726aea8`](https://github.com/yuzu-emu/yuzu//pull/12074/files) | Implement Native Code Execution (NCE) | [GPUCode](https://github.com/GPUCode/) | Yes |
 | [12110](https://github.com/yuzu-emu/yuzu//pull/12110) | [`e7878e3cf`](https://github.com/yuzu-emu/yuzu//pull/12110/files) | vk_texture_cache: add workaround for nullDescriptor on Mali | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12140](https://github.com/yuzu-emu/yuzu//pull/12140) | [`453fd4703`](https://github.com/yuzu-emu/yuzu//pull/12140/files) | query_cache: demote report synced unreachable to assert | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12142](https://github.com/yuzu-emu/yuzu//pull/12142) | [`a0d628958`](https://github.com/yuzu-emu/yuzu//pull/12142/files) | android: unload hid after shutdown | [liamwhite](https://github.com/liamwhite/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

src/android/app/src/main/jni/native.cpp

@@ -316,10 +316,8 @@ void EmulationSession::ShutdownEmulation() {
 
     m_is_running = false;
 
-    SCOPE_EXIT({
-        // Unload user input.
-        m_system.HIDCore().UnloadInputDevices();
-    });
+    // Unload user input.
+    m_system.HIDCore().UnloadInputDevices();
 
     // Shutdown the main emulated process
     if (m_load_result == Core::SystemResultStatus::Success) {

src/core/arm/nce/patch.h

@@ -6,12 +6,8 @@
 #include <span>
 #include <unordered_map>
 #include <vector>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
 #include <oaknut/code_block.hpp>
 #include <oaknut/oaknut.hpp>
-#pragma GCC diagnostic pop
 
 #include "common/common_types.h"
 #include "core/hle/kernel/code_set.h"