Handle cases when std::optional does not contain a value

src/core/core.cpp

@@ -116,6 +116,7 @@ System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& file
         }
     }
 
+    ASSERT(system_mode.first);
     ResultStatus init_result{Init(emu_window, *system_mode.first)};
     if (init_result != ResultStatus::Success) {
         LOG_CRITICAL(Core, "Failed to initialize system (Error {})!",

src/core/hle/kernel/shared_memory.cpp

@@ -147,7 +147,9 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
 
     if (base_address == 0 && target_address == 0) {
         // Calculate the address at which to map the memory block.
-        target_address = *Memory::PhysicalToVirtualAddress(linear_heap_phys_address);
+        auto maybe_vaddr = Memory::PhysicalToVirtualAddress(linear_heap_phys_address);
+        ASSERT(maybe_vaddr);
+        target_address = *maybe_vaddr;
     }
 
     // Map the memory block into the target process

src/core/hle/service/apt/applet_manager.h

@@ -142,7 +142,6 @@ public:
 
 private:
     /// Parameter data to be returned in the next call to Glance/ReceiveParameter.
-    /// TODO(Subv): Use std::optional once we migrate to C++17.
     std::optional<MessageParameter> next_parameter;
 
     static constexpr std::size_t NumAppletSlot = 4;

src/core/hle/service/apt/apt.cpp

@@ -205,8 +205,10 @@ void Module::Interface::GetSharedFont(Kernel::HLERequestContext& ctx) {
 
     // The shared font has to be relocated to the new address before being passed to the
     // application.
-    VAddr target_address =
-        *Memory::PhysicalToVirtualAddress(apt->shared_font_mem->linear_heap_phys_address);
+    auto maybe_vaddr =
+        Memory::PhysicalToVirtualAddress(apt->shared_font_mem->linear_heap_phys_address);
+    ASSERT(maybe_vaddr);
+    VAddr target_address = *maybe_vaddr;
     if (!apt->shared_font_relocated) {
         BCFNT::RelocateSharedFont(apt->shared_font_mem, target_address);
         apt->shared_font_relocated = true;

src/core/memory.cpp

@@ -433,7 +433,9 @@ void RasterizerFlushVirtualRegion(VAddr start, u32 size, FlushMode mode) {
         VAddr overlap_start = std::max(start, region_start);
         VAddr overlap_end = std::min(end, region_end);
 
-        PAddr physical_start = *TryVirtualToPhysicalAddress(overlap_start);
+        auto maybe_paddr = TryVirtualToPhysicalAddress(overlap_start);
+        ASSERT(maybe_paddr);
+        PAddr physical_start = *maybe_paddr;
         u32 overlap_size = overlap_end - overlap_start;
 
         auto* rasterizer = VideoCore::g_renderer->Rasterizer();