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
167 lines
4.0 KiB
C++
167 lines
4.0 KiB
C++
//===-- SBError.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/SBError.h"
|
|
#include "Utils.h"
|
|
#include "lldb/API/SBStream.h"
|
|
#include "lldb/Utility/Log.h"
|
|
#include "lldb/Utility/Status.h"
|
|
|
|
#include <stdarg.h>
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
SBError::SBError() : m_opaque_up() {}
|
|
|
|
SBError::SBError(const SBError &rhs) : m_opaque_up() {
|
|
m_opaque_up = clone(rhs.m_opaque_up);
|
|
}
|
|
|
|
SBError::~SBError() {}
|
|
|
|
const SBError &SBError::operator=(const SBError &rhs) {
|
|
if (this != &rhs)
|
|
m_opaque_up = clone(rhs.m_opaque_up);
|
|
return *this;
|
|
}
|
|
|
|
const char *SBError::GetCString() const {
|
|
if (m_opaque_up)
|
|
return m_opaque_up->AsCString();
|
|
return NULL;
|
|
}
|
|
|
|
void SBError::Clear() {
|
|
if (m_opaque_up)
|
|
m_opaque_up->Clear();
|
|
}
|
|
|
|
bool SBError::Fail() const {
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
|
|
|
|
bool ret_value = false;
|
|
if (m_opaque_up)
|
|
ret_value = m_opaque_up->Fail();
|
|
|
|
if (log)
|
|
log->Printf("SBError(%p)::Fail () => %i",
|
|
static_cast<void *>(m_opaque_up.get()), ret_value);
|
|
|
|
return ret_value;
|
|
}
|
|
|
|
bool SBError::Success() const {
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
|
|
bool ret_value = true;
|
|
if (m_opaque_up)
|
|
ret_value = m_opaque_up->Success();
|
|
|
|
if (log)
|
|
log->Printf("SBError(%p)::Success () => %i",
|
|
static_cast<void *>(m_opaque_up.get()), ret_value);
|
|
|
|
return ret_value;
|
|
}
|
|
|
|
uint32_t SBError::GetError() const {
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
|
|
|
|
uint32_t err = 0;
|
|
if (m_opaque_up)
|
|
err = m_opaque_up->GetError();
|
|
|
|
if (log)
|
|
log->Printf("SBError(%p)::GetError () => 0x%8.8x",
|
|
static_cast<void *>(m_opaque_up.get()), err);
|
|
|
|
return err;
|
|
}
|
|
|
|
ErrorType SBError::GetType() const {
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
|
|
ErrorType err_type = eErrorTypeInvalid;
|
|
if (m_opaque_up)
|
|
err_type = m_opaque_up->GetType();
|
|
|
|
if (log)
|
|
log->Printf("SBError(%p)::GetType () => %i",
|
|
static_cast<void *>(m_opaque_up.get()), err_type);
|
|
|
|
return err_type;
|
|
}
|
|
|
|
void SBError::SetError(uint32_t err, ErrorType type) {
|
|
CreateIfNeeded();
|
|
m_opaque_up->SetError(err, type);
|
|
}
|
|
|
|
void SBError::SetError(const Status &lldb_error) {
|
|
CreateIfNeeded();
|
|
*m_opaque_up = lldb_error;
|
|
}
|
|
|
|
void SBError::SetErrorToErrno() {
|
|
CreateIfNeeded();
|
|
m_opaque_up->SetErrorToErrno();
|
|
}
|
|
|
|
void SBError::SetErrorToGenericError() {
|
|
CreateIfNeeded();
|
|
m_opaque_up->SetErrorToErrno();
|
|
}
|
|
|
|
void SBError::SetErrorString(const char *err_str) {
|
|
CreateIfNeeded();
|
|
m_opaque_up->SetErrorString(err_str);
|
|
}
|
|
|
|
int SBError::SetErrorStringWithFormat(const char *format, ...) {
|
|
CreateIfNeeded();
|
|
va_list args;
|
|
va_start(args, format);
|
|
int num_chars = m_opaque_up->SetErrorStringWithVarArg(format, args);
|
|
va_end(args);
|
|
return num_chars;
|
|
}
|
|
|
|
bool SBError::IsValid() const { return m_opaque_up != NULL; }
|
|
|
|
void SBError::CreateIfNeeded() {
|
|
if (m_opaque_up == NULL)
|
|
m_opaque_up.reset(new Status());
|
|
}
|
|
|
|
lldb_private::Status *SBError::operator->() { return m_opaque_up.get(); }
|
|
|
|
lldb_private::Status *SBError::get() { return m_opaque_up.get(); }
|
|
|
|
lldb_private::Status &SBError::ref() {
|
|
CreateIfNeeded();
|
|
return *m_opaque_up;
|
|
}
|
|
|
|
const lldb_private::Status &SBError::operator*() const {
|
|
// Be sure to call "IsValid()" before calling this function or it will crash
|
|
return *m_opaque_up;
|
|
}
|
|
|
|
bool SBError::GetDescription(SBStream &description) {
|
|
if (m_opaque_up) {
|
|
if (m_opaque_up->Success())
|
|
description.Printf("success");
|
|
else {
|
|
const char *err_string = GetCString();
|
|
description.Printf("error: %s", (err_string != NULL ? err_string : ""));
|
|
}
|
|
} else
|
|
description.Printf("error: <NULL>");
|
|
|
|
return true;
|
|
}
|