Have SBProcess savecore always call the method with core dump options, instrument all methods in SBCoreDumpOptions

Author: Jlalond

lldb/source/API/SBCoreDumpOptions.cpp

@@ -39,38 +39,48 @@ SBCoreDumpOptions::operator=(const SBCoreDumpOptions &rhs) {
 }
 
 SBError SBCoreDumpOptions::SetPluginName(const char *name) {
+  LLDB_INSTRUMENT_VA(this, name);
   lldb_private::Status error = m_opaque_up->SetPluginName(name);
   return SBError(error);
 }
 
 void SBCoreDumpOptions::SetStyle(lldb::SaveCoreStyle style) {
+  LLDB_INSTRUMENT_VA(this, style);
   m_opaque_up->SetStyle(style);
 }
 
 void SBCoreDumpOptions::SetOutputFile(lldb::SBFileSpec file_spec) {
+  LLDB_INSTRUMENT_VA(this, file_spec);
   m_opaque_up->SetOutputFile(file_spec.ref());
 }
 
 const char *SBCoreDumpOptions::GetPluginName() const {
+  LLDB_INSTRUMENT_VA(this);
   const auto name = m_opaque_up->GetPluginName();
   if (!name)
     return nullptr;
   return lldb_private::ConstString(name.value()).GetCString();
 }
 
 SBFileSpec SBCoreDumpOptions::GetOutputFile() const {
+  LLDB_INSTRUMENT_VA(this);
   const auto file_spec = m_opaque_up->GetOutputFile();
   if (file_spec)
     return SBFileSpec(file_spec.value());
   return SBFileSpec();
 }
 
 lldb::SaveCoreStyle SBCoreDumpOptions::GetStyle() const {
+  LLDB_INSTRUMENT_VA(this);
   return m_opaque_up->GetStyle();
 }
 
 lldb_private::CoreDumpOptions &SBCoreDumpOptions::ref() const {
+  LLDB_INSTRUMENT_VA(this);
   return *m_opaque_up.get();
 }
 
-void SBCoreDumpOptions::Clear() { m_opaque_up->Clear(); }
+void SBCoreDumpOptions::Clear() { 
+    LLDB_INSTRUMENT_VA(this);
+    m_opaque_up->Clear(); 
+}

lldb/source/API/SBProcess.cpp

@@ -1217,12 +1217,16 @@ bool SBProcess::IsInstrumentationRuntimePresent(
 
 lldb::SBError SBProcess::SaveCore(const char *file_name) {
   LLDB_INSTRUMENT_VA(this, file_name);
-  return SaveCore(file_name, "", SaveCoreStyle::eSaveCoreFull);
+  SBCoreDumpOptions options;
+  options.SetOutputFile(SBFileSpec(file_name));
+  options.SetStyle(SaveCoreStyle::eSaveCoreFull);
+  return SaveCore(options);
 }
 
 lldb::SBError SBProcess::SaveCore(const char *file_name,
                                   const char *flavor,
                                   SaveCoreStyle core_style) {
+  LLDB_INSTRUMENT_VA(this, file_name, flavor, core_style);
   SBCoreDumpOptions options;
   options.SetOutputFile(SBFileSpec(file_name));
   options.SetPluginName(flavor);