fixup! Address review comments

Author: felipepiovezan

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -2603,17 +2603,16 @@ static llvm::Expected<addr_t> ReadRegisterAsAddress(RegisterContext &regctx,
 
 /// Functional wrapper to read a pointer from process memory at `addr +
 /// offset`.
-static llvm::Expected<addr_t>
-ReadPtrFromAddr(Process &process, llvm::Expected<addr_t> addr, int offset = 0) {
-  if (!addr)
-    return addr;
+static llvm::Expected<addr_t> ReadPtrFromAddr(Process &process, addr_t addr,
+                                              int offset = 0) {
   Status error;
-  addr_t ptr = process.ReadPointerFromMemory(*addr + offset, error);
+  addr_t ptr = process.ReadPointerFromMemory(addr + offset, error);
   if (ptr != LLDB_INVALID_ADDRESS)
     return ptr;
   return llvm::createStringError("SwiftLanguageRuntime: Failed to read ptr "
-                                 "from memory address 0x%8.8" PRIx64,
-                                 *addr + offset);
+                                 "from memory address 0x%8.8" PRIx64
+                                 " Error was %s",
+                                 addr + offset, error.AsCString());
 }
 
 /// Computes the Canonical Frame Address (CFA) by converting the abstract
@@ -2703,7 +2702,9 @@ static llvm::Expected<addr_t> ReadAsyncContextRegisterFromUnwind(
   case RestoreType::atCFAPlusOffset: {
     llvm::Expected<addr_t> cfa =
         GetCFA(process, regctx, unwind_regkind, row->GetCFAValue());
-    return ReadPtrFromAddr(process, std::move(cfa), regloc.GetOffset());
+    if (!cfa)
+      return cfa.takeError();
+    return ReadPtrFromAddr(process, *cfa, regloc.GetOffset());
   }
   case RestoreType::isCFAPlusOffset: {
     if (llvm::Expected<addr_t> cfa =
@@ -2736,7 +2737,7 @@ SwiftLanguageRuntime::GetRuntimeUnwindPlan(ProcessSP process_sp,
   LLDB_SCOPED_TIMER();
   auto log_expected = [](llvm::Error error) {
     Log *log = GetLog(LLDBLog::Unwind);
-    LLDB_LOG_ERROR(log, std::move(error), "SwiftLanguageRuntime: error {0}");
+    LLDB_LOG_ERROR(log, std::move(error), "{0}");
     return UnwindPlanSP();
   };
 

lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py

@@ -20,11 +20,10 @@
 # frame from another virtual frame.
 # * The plan for ASYNC___3___ -> ASYNC___4___ is created through
 # GetFollowAsyncContextUnwindPlan, but this time it follow the code path where
-# `is_indirect = True` (see its implementation).
+# `is_indirect = true` (see its implementation).
 # * The plan for ASYNC___4___ -> ASYNC___5___ is created through the same code
-# path as the previous one. It is not technically needed, but we keep it here
-# because it is the first time where we should be creating an identical plan as
-# the one from the previous frame.
+# path as the previous one. However, it is the first time an unwind plan
+# created from that path is used to create another unwind plan.
 
 class TestCase(lldbtest.TestBase):
 

lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/main.swift

@@ -14,7 +14,7 @@ func ASYNC___1___(cond: Int) async -> Int {
     work()
     if (cond + i == 3) {
       await async_work()
-      print("breaking here!")
+      print("exiting loop here!")
       break;
     }
   }