Fixes for upstream code changes.

Author: clayborg

lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp

@@ -86,7 +86,7 @@ bool ProcessElfCore::CanDebug(lldb::TargetSP target_sp,
   if (!m_core_module_sp && FileSystem::Instance().Exists(m_core_file)) {
     ModuleSpec core_module_spec(m_core_file, target_sp->GetArchitecture());
     Status error(ModuleList::GetSharedModule(core_module_spec, m_core_module_sp,
-                                             nullptr, nullptr, nullptr));
+                                             nullptr, nullptr));
     if (m_core_module_sp) {
       ObjectFile *core_objfile = m_core_module_sp->GetObjectFile();
       if (core_objfile && core_objfile->GetType() == ObjectFile::eTypeCoreFile)

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h

@@ -103,12 +103,6 @@ class GDBRemoteCommunicationServerLLGS
       std::function<std::string (GDBRemoteCommunicationServerLLGS &server,
                                  NativeProcessProtocol *process)>;
 
-  bool SetProcessStoppedCallback(ProcessStoppedChangedCallback callback) {
-    if (m_process_stopped_callback)
-      return false;
-    m_process_stopped_callback = callback;
-    return true;
-  }
   void InstallPlugin(std::unique_ptr<lldb_server::LLDBServerPlugin> plugin_up);
 
   void SetPlugin(lldb_server::LLDBServerPlugin *plugin) {

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

@@ -1139,6 +1139,7 @@ void ProcessGDBRemote::HandleGPUBreakpoints(const GPUActions &gpu_action) {
           eFunctionNameTypeFull,               // Function name type.
           eLanguageTypeUnknown,                // Language type
           0,                                   // Byte offset.
+          false,                               // Offset is instruction count.
           eLazyBoolNo,                         // Skip prologue.
           true,                                // Internal breakpoint.
           false);                              // Request hardware.