diff options
| author | 2022-06-07 17:02:29 -0400 | |
|---|---|---|
| committer | 2022-06-13 20:09:00 -0400 | |
| commit | 084d7d6b014443be7625fb9d8f1ddd309a22f6f4 (patch) | |
| tree | ea48c7b1d22a0b282846ba28a9b62c988e38bd29 /src/core/file_sys | |
| parent | Merge pull request #8458 from lat9nq/no-constexpr-flow-block (diff) | |
| download | yuzu-084d7d6b014443be7625fb9d8f1ddd309a22f6f4.tar.gz yuzu-084d7d6b014443be7625fb9d8f1ddd309a22f6f4.tar.xz yuzu-084d7d6b014443be7625fb9d8f1ddd309a22f6f4.zip | |
common: Change semantics of UNREACHABLE to unconditionally crash
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/nca_patch.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/registered_cache.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/vfs_real.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/nca_patch.cpp b/src/core/file_sys/nca_patch.cpp index d4c0a974a..2735d053b 100644 --- a/src/core/file_sys/nca_patch.cpp +++ b/src/core/file_sys/nca_patch.cpp | |||
| @@ -50,7 +50,7 @@ std::pair<std::size_t, std::size_t> SearchBucketEntry(u64 offset, const BlockTyp | |||
| 50 | low = mid + 1; | 50 | low = mid + 1; |
| 51 | } | 51 | } |
| 52 | } | 52 | } |
| 53 | UNREACHABLE_MSG("Offset could not be found in BKTR block."); | 53 | ASSERT_MSG(false, "Offset could not be found in BKTR block."); |
| 54 | return {0, 0}; | 54 | return {0, 0}; |
| 55 | } | 55 | } |
| 56 | } // Anonymous namespace | 56 | } // Anonymous namespace |
diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 2eaac73ef..878d832c2 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp | |||
| @@ -108,7 +108,7 @@ ContentRecordType GetCRTypeFromNCAType(NCAContentType type) { | |||
| 108 | // TODO(DarkLordZach): Peek at NCA contents to differentiate Manual and Legal. | 108 | // TODO(DarkLordZach): Peek at NCA contents to differentiate Manual and Legal. |
| 109 | return ContentRecordType::HtmlDocument; | 109 | return ContentRecordType::HtmlDocument; |
| 110 | default: | 110 | default: |
| 111 | UNREACHABLE_MSG("Invalid NCAContentType={:02X}", type); | 111 | ASSERT_MSG(false, "Invalid NCAContentType={:02X}", type); |
| 112 | return ContentRecordType{}; | 112 | return ContentRecordType{}; |
| 113 | } | 113 | } |
| 114 | } | 114 | } |
diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp index e42d7c9f6..cc0076238 100644 --- a/src/core/file_sys/vfs_real.cpp +++ b/src/core/file_sys/vfs_real.cpp | |||
| @@ -144,7 +144,7 @@ VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_ | |||
| 144 | LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", new_path); | 144 | LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", new_path); |
| 145 | } | 145 | } |
| 146 | } else { | 146 | } else { |
| 147 | UNREACHABLE(); | 147 | ASSERT(false); |
| 148 | return nullptr; | 148 | return nullptr; |
| 149 | } | 149 | } |
| 150 | 150 | ||