Author: Jonas Devlieghere Date: 2019-12-04T17:37:21-08:00 New Revision: fe5ab6d2cba1ddeb78567ac7c897cd30593ad366
URL: https://github.com/llvm/llvm-project/commit/fe5ab6d2cba1ddeb78567ac7c897cd30593ad366 DIFF: https://github.com/llvm/llvm-project/commit/fe5ab6d2cba1ddeb78567ac7c897cd30593ad366.diff LOG: [lldb/Reproducers] Add missing instrumentation for SBFile This was properly captured by the instrumentation framework when running TestRunCommandInterpreterAPI.py in capture-mode. Added: Modified: lldb/source/API/SBDebugger.cpp lldb/source/API/SBFile.cpp Removed: ################################################################################ diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 82dc60489008..090a3a57a2f4 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -294,7 +294,7 @@ void SBDebugger::SetInputFileHandle(FILE *fh, bool transfer_ownership) { SBError SBDebugger::SetInputFile(FileSP file_sp) { LLDB_RECORD_METHOD(SBError, SBDebugger, SetInputFile, (FileSP), file_sp); - return SetInputFile(SBFile(file_sp)); + return LLDB_RECORD_RESULT(SetInputFile(SBFile(file_sp))); } // Shouldn't really be settable after initialization as this could cause lots @@ -306,7 +306,7 @@ SBError SBDebugger::SetInputFile(SBFile file) { SBError error; if (!m_opaque_sp) { error.ref().SetErrorString("invalid debugger"); - return error; + return LLDB_RECORD_RESULT(error); } repro::DataRecorder *recorder = nullptr; @@ -330,16 +330,16 @@ SBError SBDebugger::SetInputFile(SBFile file) { if (!file_sp || !file_sp->IsValid()) { error.ref().SetErrorString("invalid file"); - return error; + return LLDB_RECORD_RESULT(error); } m_opaque_sp->SetInputFile(file_sp, recorder); - return error; + return LLDB_RECORD_RESULT(error); } SBError SBDebugger::SetOutputFile(FileSP file_sp) { LLDB_RECORD_METHOD(SBError, SBDebugger, SetOutputFile, (FileSP), file_sp); - return SetOutputFile(SBFile(file_sp)); + return LLDB_RECORD_RESULT(SetOutputFile(SBFile(file_sp))); } void SBDebugger::SetOutputFileHandle(FILE *fh, bool transfer_ownership) { @@ -353,14 +353,14 @@ SBError SBDebugger::SetOutputFile(SBFile file) { SBError error; if (!m_opaque_sp) { error.ref().SetErrorString("invalid debugger"); - return error; + return LLDB_RECORD_RESULT(error); } if (!file) { error.ref().SetErrorString("invalid file"); - return error; + return LLDB_RECORD_RESULT(error); } m_opaque_sp->SetOutputFile(file.m_opaque_sp); - return error; + return LLDB_RECORD_RESULT(error); } void SBDebugger::SetErrorFileHandle(FILE *fh, bool transfer_ownership) { @@ -371,7 +371,7 @@ void SBDebugger::SetErrorFileHandle(FILE *fh, bool transfer_ownership) { SBError SBDebugger::SetErrorFile(FileSP file_sp) { LLDB_RECORD_METHOD(SBError, SBDebugger, SetErrorFile, (FileSP), file_sp); - return SetErrorFile(SBFile(file_sp)); + return LLDB_RECORD_RESULT(SetErrorFile(SBFile(file_sp))); } SBError SBDebugger::SetErrorFile(SBFile file) { @@ -379,14 +379,14 @@ SBError SBDebugger::SetErrorFile(SBFile file) { SBError error; if (!m_opaque_sp) { error.ref().SetErrorString("invalid debugger"); - return error; + return LLDB_RECORD_RESULT(error); } if (!file) { error.ref().SetErrorString("invalid file"); - return error; + return LLDB_RECORD_RESULT(error); } m_opaque_sp->SetErrorFile(file.m_opaque_sp); - return error; + return LLDB_RECORD_RESULT(error); } FILE *SBDebugger::GetInputFileHandle() { @@ -395,7 +395,7 @@ FILE *SBDebugger::GetInputFileHandle() { File &file_sp = m_opaque_sp->GetInputFile(); return LLDB_RECORD_RESULT(file_sp.GetStream()); } - return nullptr; + return LLDB_RECORD_RESULT(nullptr); } SBFile SBDebugger::GetInputFile() { @@ -412,7 +412,7 @@ FILE *SBDebugger::GetOutputFileHandle() { StreamFile &stream_file = m_opaque_sp->GetOutputStream(); return LLDB_RECORD_RESULT(stream_file.GetFile().GetStream()); } - return nullptr; + return LLDB_RECORD_RESULT(nullptr); } SBFile SBDebugger::GetOutputFile() { @@ -431,7 +431,7 @@ FILE *SBDebugger::GetErrorFileHandle() { StreamFile &stream_file = m_opaque_sp->GetErrorStream(); return LLDB_RECORD_RESULT(stream_file.GetFile().GetStream()); } - return nullptr; + return LLDB_RECORD_RESULT(nullptr); } SBFile SBDebugger::GetErrorFile() { diff --git a/lldb/source/API/SBFile.cpp b/lldb/source/API/SBFile.cpp index f5a38efe4a77..215e82cd46ac 100644 --- a/lldb/source/API/SBFile.cpp +++ b/lldb/source/API/SBFile.cpp @@ -117,7 +117,10 @@ namespace lldb_private { namespace repro { template <> void RegisterMethods<SBFile>(Registry &R) { - + LLDB_REGISTER_CONSTRUCTOR(SBFile, ()); + LLDB_REGISTER_CONSTRUCTOR(SBFile, (FileSP)); + LLDB_REGISTER_CONSTRUCTOR(SBFile, (FILE *, bool)); + LLDB_REGISTER_CONSTRUCTOR(SBFile, (int, const char *, bool)); LLDB_REGISTER_METHOD(lldb::SBError, SBFile, Flush, ()); LLDB_REGISTER_METHOD_CONST(bool, SBFile, IsValid, ()); LLDB_REGISTER_METHOD_CONST(bool, SBFile, operator bool,()); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits