Merge commit '6779a953f891' from swift/release/5.3 into swift/master

Author: git apple-llvm automerger

lldb/source/Target/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -639,8 +639,9 @@ llvm::Optional<uint64_t> SwiftLanguageRuntimeImpl::GetMemberVariableOffset(
 
   llvm::Optional<SwiftASTContextReader> scratch_ctx;
   if (instance) {
-    scratch_ctx = instance->GetScratchSwiftASTContext();
-    if (!scratch_ctx)
+    if (SwiftASTContextReader reader = instance->GetScratchSwiftASTContext())
+      scratch_ctx = reader;
+    else
       return llvm::None;
   }