This is an archive of the discontinued LLVM Phabricator instance.

Differential D32518

ArrayRef-ize ValueObject
ClosedPublic

Authored by lhames on Apr 25 2017, 6:14 PM.

Details

Reviewers
jingham
Summary

Using llvm::ArrayRef rather than std::vector/initializer_list allows us to remove some overloads, avoid some temporary copies, and allows these methods to work with all array-like types.

The only drawback is that initializer lists of exactly two elements become ambiguous for GetChildAtIndexPath, since they could be an array of two size_ts, or a singleton pair of a size_t and a bool. In practice this only requires disambiguation at a single call-site in all of LLDB, so it seems like a decent trade-off.

Diff Detail

Repository
rL LLVM

Event Timeline

lhames created this revision.Apr 25 2017, 6:14 PM
jingham accepted this revision.Apr 26 2017, 10:49 AM

That seems fine: the compiler will keep you from making a mistake, and the two element syntax is not terribly onerous.

This revision is now accepted and ready to land.Apr 26 2017, 10:49 AM
lhames closed this revision.Apr 26 2017, 11:29 AM

Thanks Jim.

Landed in r301441.

Revision Contents

PathSize
include/
lldb/
Core/
26 lines
source/
Core/
34 lines
Plugins/
Language/
CPlusPlus/
3 lines

Diff 96663

include/lldb/Core/ValueObject.h

Context not available.
#include "lldb/lldb-private-enumerations.h" // for AddressType #include "lldb/lldb-private-enumerations.h" // for AddressType
#include "lldb/lldb-types.h" // for addr_t, offs... #include "lldb/lldb-types.h" // for addr_t, offs...
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h" #include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h" // for StringRef #include "llvm/ADT/StringRef.h" // for StringRef
Context not available.
#include <mutex> // for recursive_mutex #include <mutex> // for recursive_mutex
#include <string> // for string #include <string> // for string
#include <utility> // for pair #include <utility> // for pair
#include <vector>
#include <stddef.h> // for size_t #include <stddef.h> // for size_t
#include <stdint.h> // for uint32_t #include <stdint.h> // for uint32_t
Context not available.
virtual lldb::ValueObjectSP GetChildAtIndex(size_t idx, bool can_create); virtual lldb::ValueObjectSP GetChildAtIndex(size_t idx, bool can_create);
// this will always create the children if necessary // this will always create the children if necessary
lldb::ValueObjectSP lldb::ValueObjectSP GetChildAtIndexPath(llvm::ArrayRef<size_t> idxs,
GetChildAtIndexPath(const std::initializer_list<size_t> &idxs,
size_t *index_of_error = nullptr);
lldb::ValueObjectSP GetChildAtIndexPath(const std::vector<size_t> &idxs,
size_t *index_of_error = nullptr); size_t *index_of_error = nullptr);
lldb::ValueObjectSP GetChildAtIndexPath(
const std::initializer_list<std::pair<size_t, bool>> &idxs,
size_t *index_of_error = nullptr);
lldb::ValueObjectSP lldb::ValueObjectSP
GetChildAtIndexPath(const std::vector<std::pair<size_t, bool>> &idxs, GetChildAtIndexPath(llvm::ArrayRef<std::pair<size_t, bool>> idxs,
size_t *index_of_error = nullptr); size_t *index_of_error = nullptr);
// this will always create the children if necessary // this will always create the children if necessary
lldb::ValueObjectSP lldb::ValueObjectSP GetChildAtNamePath(llvm::ArrayRef<ConstString> names,
GetChildAtNamePath(const std::initializer_list<ConstString> &names,
ConstString *name_of_error = nullptr);
lldb::ValueObjectSP GetChildAtNamePath(const std::vector<ConstString> &names,
ConstString *name_of_error = nullptr); ConstString *name_of_error = nullptr);
lldb::ValueObjectSP GetChildAtNamePath(
const std::initializer_list<std::pair<ConstString, bool>> &names,
ConstString *name_of_error = nullptr);
lldb::ValueObjectSP lldb::ValueObjectSP
GetChildAtNamePath(const std::vector<std::pair<ConstString, bool>> &names, GetChildAtNamePath(llvm::ArrayRef<std::pair<ConstString, bool>> names,
ConstString *name_of_error = nullptr); ConstString *name_of_error = nullptr);
virtual lldb::ValueObjectSP GetChildMemberWithName(const ConstString &name, virtual lldb::ValueObjectSP GetChildMemberWithName(const ConstString &name,
Context not available.

source/Core/ValueObject.cpp

Context not available.
return child_sp; return child_sp;
} }
ValueObjectSP
ValueObject::GetChildAtIndexPath(const std::initializer_list<size_t> &idxs,
size_t *index_of_error) {
return GetChildAtIndexPath(std::vector<size_t>(idxs), index_of_error);
}
ValueObjectSP ValueObject::GetChildAtIndexPath(
const std::initializer_list<std::pair<size_t, bool>> &idxs,
size_t *index_of_error) {
return GetChildAtIndexPath(std::vector<std::pair<size_t, bool>>(idxs),
index_of_error);
}
lldb::ValueObjectSP lldb::ValueObjectSP
ValueObject::GetChildAtIndexPath(const std::vector<size_t> &idxs, ValueObject::GetChildAtIndexPath(llvm::ArrayRef<size_t> idxs,
size_t *index_of_error) { size_t *index_of_error) {
if (idxs.size() == 0) if (idxs.size() == 0)
return GetSP(); return GetSP();
Context not available.
} }
lldb::ValueObjectSP ValueObject::GetChildAtIndexPath( lldb::ValueObjectSP ValueObject::GetChildAtIndexPath(
const std::vector<std::pair<size_t, bool>> &idxs, size_t *index_of_error) { llvm::ArrayRef<std::pair<size_t, bool>> idxs, size_t *index_of_error) {
if (idxs.size() == 0) if (idxs.size() == 0)
return GetSP(); return GetSP();
ValueObjectSP root(GetSP()); ValueObjectSP root(GetSP());
Context not available.
} }
lldb::ValueObjectSP lldb::ValueObjectSP
ValueObject::GetChildAtNamePath(const std::initializer_list<ConstString> &names, ValueObject::GetChildAtNamePath(llvm::ArrayRef<ConstString> names,
ConstString *name_of_error) { ConstString *name_of_error) {
return GetChildAtNamePath(std::vector<ConstString>(names), name_of_error);
}
lldb::ValueObjectSP ValueObject::GetChildAtNamePath(
const std::initializer_list<std::pair<ConstString, bool>> &names,
ConstString *name_of_error) {
return GetChildAtNamePath(std::vector<std::pair<ConstString, bool>>(names),
name_of_error);
}
lldb::ValueObjectSP
ValueObject::GetChildAtNamePath(const std::vector<ConstString> &names,
ConstString *name_of_error) {
if (names.size() == 0) if (names.size() == 0)
return GetSP(); return GetSP();
ValueObjectSP root(GetSP()); ValueObjectSP root(GetSP());
Context not available.
} }
lldb::ValueObjectSP ValueObject::GetChildAtNamePath( lldb::ValueObjectSP ValueObject::GetChildAtNamePath(
const std::vector<std::pair<ConstString, bool>> &names, llvm::ArrayRef<std::pair<ConstString, bool>> names,
ConstString *name_of_error) { ConstString *name_of_error) {
if (names.size() == 0) if (names.size() == 0)
return GetSP(); return GetSP();
Context not available.

source/Plugins/Language/CPlusPlus/LibCxx.cpp

Context not available.
if (!D) if (!D)
return false; return false;
ValueObjectSP layout_decider(D->GetChildAtIndexPath({0, 0})); ValueObjectSP layout_decider(
D->GetChildAtIndexPath(llvm::ArrayRef<size_t>({0, 0})));
// this child should exist // this child should exist
if (!layout_decider) if (!layout_decider)
Context not available.