Address Adrian's feedback

Author: JDevlieghere

lldb/source/Core/Debugger.cpp

@@ -1536,7 +1536,7 @@ bool Debugger::FormatDisassemblerAddress(const FormatEntity::Entry *format,
   FormatEntity::Entry format_entry;
   if (format)
     format_entry = *format;
-  else if (exe_ctx != nullptr && exe_ctx->HasTargetScope())
+  else if (exe_ctx && exe_ctx->HasTargetScope())
     format_entry = exe_ctx->GetTargetRef().GetDebugger().GetDisassemblyFormat();
   else
     FormatEntity::Parse("${addr}: ", format_entry);

lldb/source/Core/Statusline.cpp

@@ -148,5 +148,5 @@ void Statusline::Redraw(bool update) {
   FormatEntity::Format(format, stream, &symbol_ctx, &exe_ctx, nullptr, nullptr,
                        false, false);
 
-  Draw(std::string(stream.GetString()));
+  Draw(stream.GetString().str());
 }