Merge commit '50d2d33b8ef5' from llvm.org/master into apple/master

Author: git apple-llvm automerger

lldb/source/Utility/Broadcaster.cpp

@@ -406,7 +406,7 @@ void BroadcasterManager::RemoveListener(Listener *listener) {
   listener_collection::iterator iter = m_listeners.begin(),
                                 end_iter = m_listeners.end();
 
-  std::find_if(iter, end_iter, predicate);
+  iter = std::find_if(iter, end_iter, predicate);
   if (iter != end_iter)
     m_listeners.erase(iter);