mirror of
https://github.com/intel/llvm.git
synced 2026-01-15 12:25:46 +08:00
bd4bf82a48
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
102 lines
3.0 KiB
C++
102 lines
3.0 KiB
C++
//===-- SBFileSpecList.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 <limits.h>
|
|
|
|
#include "Utils.h"
|
|
#include "lldb/API/SBFileSpec.h"
|
|
#include "lldb/API/SBFileSpecList.h"
|
|
#include "lldb/API/SBStream.h"
|
|
#include "lldb/Core/FileSpecList.h"
|
|
#include "lldb/Host/PosixApi.h"
|
|
#include "lldb/Utility/FileSpec.h"
|
|
#include "lldb/Utility/Log.h"
|
|
#include "lldb/Utility/Stream.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
SBFileSpecList::SBFileSpecList() : m_opaque_up(new FileSpecList()) {}
|
|
|
|
SBFileSpecList::SBFileSpecList(const SBFileSpecList &rhs) : m_opaque_up() {
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
|
|
|
|
m_opaque_up = clone(rhs.m_opaque_up);
|
|
|
|
if (log) {
|
|
log->Printf("SBFileSpecList::SBFileSpecList (const SBFileSpecList "
|
|
"rhs.ap=%p) => SBFileSpecList(%p)",
|
|
static_cast<void *>(rhs.m_opaque_up.get()),
|
|
static_cast<void *>(m_opaque_up.get()));
|
|
}
|
|
}
|
|
|
|
SBFileSpecList::~SBFileSpecList() {}
|
|
|
|
const SBFileSpecList &SBFileSpecList::operator=(const SBFileSpecList &rhs) {
|
|
if (this != &rhs)
|
|
m_opaque_up = clone(rhs.m_opaque_up);
|
|
return *this;
|
|
}
|
|
|
|
uint32_t SBFileSpecList::GetSize() const { return m_opaque_up->GetSize(); }
|
|
|
|
void SBFileSpecList::Append(const SBFileSpec &sb_file) {
|
|
m_opaque_up->Append(sb_file.ref());
|
|
}
|
|
|
|
bool SBFileSpecList::AppendIfUnique(const SBFileSpec &sb_file) {
|
|
return m_opaque_up->AppendIfUnique(sb_file.ref());
|
|
}
|
|
|
|
void SBFileSpecList::Clear() { m_opaque_up->Clear(); }
|
|
|
|
uint32_t SBFileSpecList::FindFileIndex(uint32_t idx, const SBFileSpec &sb_file,
|
|
bool full) {
|
|
return m_opaque_up->FindFileIndex(idx, sb_file.ref(), full);
|
|
}
|
|
|
|
const SBFileSpec SBFileSpecList::GetFileSpecAtIndex(uint32_t idx) const {
|
|
SBFileSpec new_spec;
|
|
new_spec.SetFileSpec(m_opaque_up->GetFileSpecAtIndex(idx));
|
|
return new_spec;
|
|
}
|
|
|
|
const lldb_private::FileSpecList *SBFileSpecList::operator->() const {
|
|
return m_opaque_up.get();
|
|
}
|
|
|
|
const lldb_private::FileSpecList *SBFileSpecList::get() const {
|
|
return m_opaque_up.get();
|
|
}
|
|
|
|
const lldb_private::FileSpecList &SBFileSpecList::operator*() const {
|
|
return *m_opaque_up;
|
|
}
|
|
|
|
const lldb_private::FileSpecList &SBFileSpecList::ref() const {
|
|
return *m_opaque_up;
|
|
}
|
|
|
|
bool SBFileSpecList::GetDescription(SBStream &description) const {
|
|
Stream &strm = description.ref();
|
|
|
|
if (m_opaque_up) {
|
|
uint32_t num_files = m_opaque_up->GetSize();
|
|
strm.Printf("%d files: ", num_files);
|
|
for (uint32_t i = 0; i < num_files; i++) {
|
|
char path[PATH_MAX];
|
|
if (m_opaque_up->GetFileSpecAtIndex(i).GetPath(path, sizeof(path)))
|
|
strm.Printf("\n %s", path);
|
|
}
|
|
} else
|
|
strm.PutCString("No value");
|
|
|
|
return true;
|
|
}
|