Files
clang-p2996/lldb/source/API/SBFileSpec.cpp
Jonas Devlieghere bd4bf82a48 [SBAPI] Don't check IsValid in constructor
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
2019-03-06 00:05:55 +00:00

172 lines
5.0 KiB
C++

//===-- SBFileSpec.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 <inttypes.h>
#include <limits.h>
#include "Utils.h"
#include "lldb/API/SBFileSpec.h"
#include "lldb/API/SBStream.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/PosixApi.h"
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/Stream.h"
#include "llvm/ADT/SmallString.h"
using namespace lldb;
using namespace lldb_private;
SBFileSpec::SBFileSpec() : m_opaque_up(new lldb_private::FileSpec()) {}
SBFileSpec::SBFileSpec(const SBFileSpec &rhs) : m_opaque_up() {
m_opaque_up = clone(rhs.m_opaque_up);
}
SBFileSpec::SBFileSpec(const lldb_private::FileSpec &fspec)
: m_opaque_up(new lldb_private::FileSpec(fspec)) {}
// Deprecated!!!
SBFileSpec::SBFileSpec(const char *path) : m_opaque_up(new FileSpec(path)) {
FileSystem::Instance().Resolve(*m_opaque_up);
}
SBFileSpec::SBFileSpec(const char *path, bool resolve)
: m_opaque_up(new FileSpec(path)) {
if (resolve)
FileSystem::Instance().Resolve(*m_opaque_up);
}
SBFileSpec::~SBFileSpec() {}
const SBFileSpec &SBFileSpec::operator=(const SBFileSpec &rhs) {
if (this != &rhs)
m_opaque_up = clone(rhs.m_opaque_up);
return *this;
}
bool SBFileSpec::IsValid() const { return m_opaque_up->operator bool(); }
bool SBFileSpec::Exists() const {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
bool result = FileSystem::Instance().Exists(*m_opaque_up);
if (log)
log->Printf("SBFileSpec(%p)::Exists () => %s",
static_cast<void *>(m_opaque_up.get()),
(result ? "true" : "false"));
return result;
}
bool SBFileSpec::ResolveExecutableLocation() {
return FileSystem::Instance().ResolveExecutableLocation(*m_opaque_up);
}
int SBFileSpec::ResolvePath(const char *src_path, char *dst_path,
size_t dst_len) {
llvm::SmallString<64> result(src_path);
FileSystem::Instance().Resolve(result);
::snprintf(dst_path, dst_len, "%s", result.c_str());
return std::min(dst_len - 1, result.size());
}
const char *SBFileSpec::GetFilename() const {
const char *s = m_opaque_up->GetFilename().AsCString();
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
if (log) {
if (s)
log->Printf("SBFileSpec(%p)::GetFilename () => \"%s\"",
static_cast<void *>(m_opaque_up.get()), s);
else
log->Printf("SBFileSpec(%p)::GetFilename () => NULL",
static_cast<void *>(m_opaque_up.get()));
}
return s;
}
const char *SBFileSpec::GetDirectory() const {
FileSpec directory{*m_opaque_up};
directory.GetFilename().Clear();
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
if (log) {
if (directory)
log->Printf("SBFileSpec(%p)::GetDirectory () => \"%s\"",
static_cast<void *>(m_opaque_up.get()),
directory.GetCString());
else
log->Printf("SBFileSpec(%p)::GetDirectory () => NULL",
static_cast<void *>(m_opaque_up.get()));
}
return directory.GetCString();
}
void SBFileSpec::SetFilename(const char *filename) {
if (filename && filename[0])
m_opaque_up->GetFilename().SetCString(filename);
else
m_opaque_up->GetFilename().Clear();
}
void SBFileSpec::SetDirectory(const char *directory) {
if (directory && directory[0])
m_opaque_up->GetDirectory().SetCString(directory);
else
m_opaque_up->GetDirectory().Clear();
}
uint32_t SBFileSpec::GetPath(char *dst_path, size_t dst_len) const {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
uint32_t result = m_opaque_up->GetPath(dst_path, dst_len);
if (log)
log->Printf("SBFileSpec(%p)::GetPath (dst_path=\"%.*s\", dst_len=%" PRIu64
") => %u",
static_cast<void *>(m_opaque_up.get()), result, dst_path,
static_cast<uint64_t>(dst_len), result);
if (result == 0 && dst_path && dst_len > 0)
*dst_path = '\0';
return result;
}
const lldb_private::FileSpec *SBFileSpec::operator->() const {
return m_opaque_up.get();
}
const lldb_private::FileSpec *SBFileSpec::get() const {
return m_opaque_up.get();
}
const lldb_private::FileSpec &SBFileSpec::operator*() const {
return *m_opaque_up;
}
const lldb_private::FileSpec &SBFileSpec::ref() const { return *m_opaque_up; }
void SBFileSpec::SetFileSpec(const lldb_private::FileSpec &fs) {
*m_opaque_up = fs;
}
bool SBFileSpec::GetDescription(SBStream &description) const {
Stream &strm = description.ref();
char path[PATH_MAX];
if (m_opaque_up->GetPath(path, sizeof(path)))
strm.PutCString(path);
return true;
}
void SBFileSpec::AppendPathComponent(const char *fn) {
m_opaque_up->AppendPathComponent(fn);
}