Merge pull request #7053 from augusto2112/wrap-dwim-swift

[lldb][NFC] Wrap Swift-only code in DWIM-print into commented blocks

Author: JDevlieghere

lldb/source/Commands/CommandObjectDWIMPrint.cpp

@@ -99,6 +99,16 @@ bool CommandObjectDWIMPrint::DoExecute(StringRef command,
 
   StackFrame *frame = m_exe_ctx.GetFramePtr();
 
+  // BEGIN SWIFT
+  bool is_po = m_varobj_options.use_objc;
+  // Either the language was explicitly specified, or we check the frame.
+  lldb::LanguageType language;
+  if (m_expr_options.language != lldb::eLanguageTypeUnknown)
+    language = m_expr_options.language;
+  else if (frame) 
+    language = frame->GuessLanguage();
+  // END SWIFT
+  
   // First, try `expr` as the name of a frame variable.
   if (frame) {
     auto valobj_sp = frame->FindVariable(ConstString(expr));
@@ -122,6 +132,7 @@ bool CommandObjectDWIMPrint::DoExecute(StringRef command,
     }
   }
 
+  // BEGIN SWIFT
   // For Swift frames, rewrite `po 0x12345600` to use `unsafeBitCast`.
   //
   // This works only when the address points to an instance of a class. This
@@ -142,12 +153,7 @@ bool CommandObjectDWIMPrint::DoExecute(StringRef command,
   //   3. Require addresses to be on the heap
   std::string modified_expr_storage;
   // Either Swift was explicitly specified, or the frame is Swift.
-  bool is_swift = false;
-  if (m_expr_options.language == lldb::eLanguageTypeSwift)
-    is_swift = true;
-  else if (m_expr_options.language == lldb::eLanguageTypeUnknown)
-    is_swift = frame && frame->GuessLanguage() == lldb::eLanguageTypeSwift;
-  bool is_po = m_varobj_options.use_objc;
+  bool is_swift = language == lldb::eLanguageTypeSwift;
   if (is_swift && is_po) {
     lldb::addr_t addr;
     bool is_integer = !expr.getAsInteger(0, addr);
@@ -162,6 +168,7 @@ bool CommandObjectDWIMPrint::DoExecute(StringRef command,
       }
     }
   }
+  // END SWIFT
 
   // Second, also lastly, try `expr` as a source expression to evaluate.
   {