When running the test suite with the instrumentation macros, I noticed two lldb-mi tests regressed. The issue was the copy constructor of SBLineEntry. Without the macros the returned value would be elided, but with the macros the copy constructor was called. The latter using ::IsValid to determine whether the underlying opaque pointer should be set. This is likely a remnant of when ::IsValid would only check the validity of the smart pointer. In SBLineEntry however, it actually forwards to LineEntry::IsValid(). So what happened here was that because of the macros the copy constructor was called. The opaque pointer was valid but the LineEntry didn't consider itself valid. So the copied-to object ended up default initialized. This patch replaces all checks for IsValid in copy (assignment) constructors with checks for the opaque pointer itself. Differential revision: https://reviews.llvm.org/D58946 llvm-svn: 355458
270 lines
7.4 KiB
C++
270 lines
7.4 KiB
C++
//===-- SBCommandReturnObject.cpp -------------------------------*- C++ -*-===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lldb/API/SBCommandReturnObject.h"
|
|
#include "Utils.h"
|
|
#include "lldb/API/SBError.h"
|
|
#include "lldb/API/SBStream.h"
|
|
#include "lldb/Interpreter/CommandReturnObject.h"
|
|
#include "lldb/Utility/ConstString.h"
|
|
#include "lldb/Utility/Log.h"
|
|
#include "lldb/Utility/Status.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
SBCommandReturnObject::SBCommandReturnObject()
|
|
: m_opaque_up(new CommandReturnObject()) {}
|
|
|
|
SBCommandReturnObject::SBCommandReturnObject(const SBCommandReturnObject &rhs)
|
|
: m_opaque_up() {
|
|
m_opaque_up = clone(rhs.m_opaque_up);
|
|
}
|
|
|
|
SBCommandReturnObject::SBCommandReturnObject(CommandReturnObject *ptr)
|
|
: m_opaque_up(ptr) {}
|
|
|
|
SBCommandReturnObject::~SBCommandReturnObject() = default;
|
|
|
|
CommandReturnObject *SBCommandReturnObject::Release() {
|
|
return m_opaque_up.release();
|
|
}
|
|
|
|
const SBCommandReturnObject &SBCommandReturnObject::
|
|
operator=(const SBCommandReturnObject &rhs) {
|
|
if (this != &rhs)
|
|
m_opaque_up = clone(rhs.m_opaque_up);
|
|
return *this;
|
|
}
|
|
|
|
bool SBCommandReturnObject::IsValid() const { return m_opaque_up != nullptr; }
|
|
|
|
const char *SBCommandReturnObject::GetOutput() {
|
|
Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
|
|
|
|
if (m_opaque_up) {
|
|
llvm::StringRef output = m_opaque_up->GetOutputData();
|
|
ConstString result(output.empty() ? llvm::StringRef("") : output);
|
|
|
|
if (log)
|
|
log->Printf("SBCommandReturnObject(%p)::GetOutput () => \"%s\"",
|
|
static_cast<void *>(m_opaque_up.get()), result.AsCString());
|
|
|
|
return result.AsCString();
|
|
}
|
|
|
|
if (log)
|
|
log->Printf("SBCommandReturnObject(%p)::GetOutput () => nullptr",
|
|
static_cast<void *>(m_opaque_up.get()));
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
const char *SBCommandReturnObject::GetError() {
|
|
Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
|
|
|
|
if (m_opaque_up) {
|
|
llvm::StringRef output = m_opaque_up->GetErrorData();
|
|
ConstString result(output.empty() ? llvm::StringRef("") : output);
|
|
if (log)
|
|
log->Printf("SBCommandReturnObject(%p)::GetError () => \"%s\"",
|
|
static_cast<void *>(m_opaque_up.get()), result.AsCString());
|
|
|
|
return result.AsCString();
|
|
}
|
|
|
|
if (log)
|
|
log->Printf("SBCommandReturnObject(%p)::GetError () => nullptr",
|
|
static_cast<void *>(m_opaque_up.get()));
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
size_t SBCommandReturnObject::GetOutputSize() {
|
|
return (m_opaque_up ? m_opaque_up->GetOutputData().size() : 0);
|
|
}
|
|
|
|
size_t SBCommandReturnObject::GetErrorSize() {
|
|
return (m_opaque_up ? m_opaque_up->GetErrorData().size() : 0);
|
|
}
|
|
|
|
size_t SBCommandReturnObject::PutOutput(FILE *fh) {
|
|
if (fh) {
|
|
size_t num_bytes = GetOutputSize();
|
|
if (num_bytes)
|
|
return ::fprintf(fh, "%s", GetOutput());
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
size_t SBCommandReturnObject::PutError(FILE *fh) {
|
|
if (fh) {
|
|
size_t num_bytes = GetErrorSize();
|
|
if (num_bytes)
|
|
return ::fprintf(fh, "%s", GetError());
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void SBCommandReturnObject::Clear() {
|
|
if (m_opaque_up)
|
|
m_opaque_up->Clear();
|
|
}
|
|
|
|
lldb::ReturnStatus SBCommandReturnObject::GetStatus() {
|
|
return (m_opaque_up ? m_opaque_up->GetStatus() : lldb::eReturnStatusInvalid);
|
|
}
|
|
|
|
void SBCommandReturnObject::SetStatus(lldb::ReturnStatus status) {
|
|
if (m_opaque_up)
|
|
m_opaque_up->SetStatus(status);
|
|
}
|
|
|
|
bool SBCommandReturnObject::Succeeded() {
|
|
return (m_opaque_up ? m_opaque_up->Succeeded() : false);
|
|
}
|
|
|
|
bool SBCommandReturnObject::HasResult() {
|
|
return (m_opaque_up ? m_opaque_up->HasResult() : false);
|
|
}
|
|
|
|
void SBCommandReturnObject::AppendMessage(const char *message) {
|
|
if (m_opaque_up)
|
|
m_opaque_up->AppendMessage(message);
|
|
}
|
|
|
|
void SBCommandReturnObject::AppendWarning(const char *message) {
|
|
if (m_opaque_up)
|
|
m_opaque_up->AppendWarning(message);
|
|
}
|
|
|
|
CommandReturnObject *SBCommandReturnObject::operator->() const {
|
|
return m_opaque_up.get();
|
|
}
|
|
|
|
CommandReturnObject *SBCommandReturnObject::get() const {
|
|
return m_opaque_up.get();
|
|
}
|
|
|
|
CommandReturnObject &SBCommandReturnObject::operator*() const {
|
|
assert(m_opaque_up.get());
|
|
return *(m_opaque_up.get());
|
|
}
|
|
|
|
CommandReturnObject &SBCommandReturnObject::ref() const {
|
|
assert(m_opaque_up.get());
|
|
return *(m_opaque_up.get());
|
|
}
|
|
|
|
void SBCommandReturnObject::SetLLDBObjectPtr(CommandReturnObject *ptr) {
|
|
if (m_opaque_up)
|
|
m_opaque_up.reset(ptr);
|
|
}
|
|
|
|
bool SBCommandReturnObject::GetDescription(SBStream &description) {
|
|
Stream &strm = description.ref();
|
|
|
|
if (m_opaque_up) {
|
|
description.Printf("Error: ");
|
|
lldb::ReturnStatus status = m_opaque_up->GetStatus();
|
|
if (status == lldb::eReturnStatusStarted)
|
|
strm.PutCString("Started");
|
|
else if (status == lldb::eReturnStatusInvalid)
|
|
strm.PutCString("Invalid");
|
|
else if (m_opaque_up->Succeeded())
|
|
strm.PutCString("Success");
|
|
else
|
|
strm.PutCString("Fail");
|
|
|
|
if (GetOutputSize() > 0)
|
|
strm.Printf("\nOutput Message:\n%s", GetOutput());
|
|
|
|
if (GetErrorSize() > 0)
|
|
strm.Printf("\nError Message:\n%s", GetError());
|
|
} else
|
|
strm.PutCString("No value");
|
|
|
|
return true;
|
|
}
|
|
|
|
void SBCommandReturnObject::SetImmediateOutputFile(FILE *fh) {
|
|
SetImmediateOutputFile(fh, false);
|
|
}
|
|
|
|
void SBCommandReturnObject::SetImmediateErrorFile(FILE *fh) {
|
|
SetImmediateErrorFile(fh, false);
|
|
}
|
|
|
|
void SBCommandReturnObject::SetImmediateOutputFile(FILE *fh,
|
|
bool transfer_ownership) {
|
|
if (m_opaque_up)
|
|
m_opaque_up->SetImmediateOutputFile(fh, transfer_ownership);
|
|
}
|
|
|
|
void SBCommandReturnObject::SetImmediateErrorFile(FILE *fh,
|
|
bool transfer_ownership) {
|
|
if (m_opaque_up)
|
|
m_opaque_up->SetImmediateErrorFile(fh, transfer_ownership);
|
|
}
|
|
|
|
void SBCommandReturnObject::PutCString(const char *string, int len) {
|
|
if (m_opaque_up) {
|
|
if (len == 0 || string == nullptr || *string == 0) {
|
|
return;
|
|
} else if (len > 0) {
|
|
std::string buffer(string, len);
|
|
m_opaque_up->AppendMessage(buffer.c_str());
|
|
} else
|
|
m_opaque_up->AppendMessage(string);
|
|
}
|
|
}
|
|
|
|
const char *SBCommandReturnObject::GetOutput(bool only_if_no_immediate) {
|
|
if (!m_opaque_up)
|
|
return nullptr;
|
|
if (!only_if_no_immediate ||
|
|
m_opaque_up->GetImmediateOutputStream().get() == nullptr)
|
|
return GetOutput();
|
|
return nullptr;
|
|
}
|
|
|
|
const char *SBCommandReturnObject::GetError(bool only_if_no_immediate) {
|
|
if (!m_opaque_up)
|
|
return nullptr;
|
|
if (!only_if_no_immediate ||
|
|
m_opaque_up->GetImmediateErrorStream().get() == nullptr)
|
|
return GetError();
|
|
return nullptr;
|
|
}
|
|
|
|
size_t SBCommandReturnObject::Printf(const char *format, ...) {
|
|
if (m_opaque_up) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
size_t result = m_opaque_up->GetOutputStream().PrintfVarArg(format, args);
|
|
va_end(args);
|
|
return result;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void SBCommandReturnObject::SetError(lldb::SBError &error,
|
|
const char *fallback_error_cstr) {
|
|
if (m_opaque_up) {
|
|
if (error.IsValid())
|
|
m_opaque_up->SetError(error.ref(), fallback_error_cstr);
|
|
else if (fallback_error_cstr)
|
|
m_opaque_up->SetError(Status(), fallback_error_cstr);
|
|
}
|
|
}
|
|
|
|
void SBCommandReturnObject::SetError(const char *error_cstr) {
|
|
if (m_opaque_up && error_cstr)
|
|
m_opaque_up->SetError(error_cstr);
|
|
}
|