Skip to content

Commit 7b8951c

Browse files
committed
revert MutableArrayRef back to vector
1 parent 4bd5d15 commit 7b8951c

File tree

4 files changed

+11
-19
lines changed

4 files changed

+11
-19
lines changed

lldb/include/lldb/Target/SwiftLanguageRuntime.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,9 @@ class SwiftLanguageRuntime : public LanguageRuntime {
256256
llvm::Optional<unsigned> GetNumChildren(CompilerType type,
257257
ValueObject *valobj);
258258

259-
llvm::Optional<size_t>
260-
GetIndexOfChildMemberWithName(CompilerType type, llvm::StringRef name,
261-
ExecutionContext *exe_ctx,
262-
bool omit_empty_base_classes,
263-
llvm::MutableArrayRef<uint32_t> child_indexes);
259+
llvm::Optional<size_t> GetIndexOfChildMemberWithName(
260+
CompilerType type, llvm::StringRef name, ExecutionContext *exe_ctx,
261+
bool omit_empty_base_classes, std::vector<uint32_t> &child_indexes);
264262

265263
/// Ask Remote Mirrors about a child of a composite type.
266264
CompilerType GetChildCompilerTypeAtIndex(

lldb/source/Target/SwiftLanguageRuntime.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,9 @@ class SwiftLanguageRuntimeStub {
257257
return {};
258258
}
259259

260-
llvm::Optional<size_t>
261-
GetIndexOfChildMemberWithName(CompilerType type, llvm::StringRef name,
262-
ExecutionContext *exe_ctx,
263-
bool omit_empty_base_classes,
264-
llvm::MutableArrayRef<uint32_t> child_indexes) {
260+
llvm::Optional<size_t> GetIndexOfChildMemberWithName(
261+
CompilerType type, llvm::StringRef name, ExecutionContext *exe_ctx,
262+
bool omit_empty_base_classes, std::vector<uint32_t> &child_indexes) {
265263
STUB_LOG();
266264
return {};
267265
}
@@ -2155,8 +2153,7 @@ SwiftLanguageRuntime::GetNumChildren(CompilerType type, ValueObject *valobj) {
21552153

21562154
llvm::Optional<size_t> SwiftLanguageRuntime::GetIndexOfChildMemberWithName(
21572155
CompilerType type, llvm::StringRef name, ExecutionContext *exe_ctx,
2158-
bool omit_empty_base_classes,
2159-
llvm::MutableArrayRef<uint32_t> child_indexes) {
2156+
bool omit_empty_base_classes, std::vector<uint32_t> &child_indexes) {
21602157
FORWARD(GetIndexOfChildMemberWithName, type, name, exe_ctx,
21612158
omit_empty_base_classes, child_indexes);
21622159
}

lldb/source/Target/SwiftLanguageRuntimeDynamicTypeResolution.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,8 +1144,7 @@ GetTypeFromTypeRef(TypeSystemSwiftTypeRef &ts,
11441144

11451145
llvm::Optional<size_t> SwiftLanguageRuntimeImpl::GetIndexOfChildMemberWithName(
11461146
CompilerType type, llvm::StringRef name, ExecutionContext *exe_ctx,
1147-
bool omit_empty_base_classes,
1148-
llvm::MutableArrayRef<uint32_t> child_indexes) {
1147+
bool omit_empty_base_classes, std::vector<uint32_t> &child_indexes) {
11491148
return {};
11501149
}
11511150

lldb/source/Target/SwiftLanguageRuntimeImpl.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,9 @@ class SwiftLanguageRuntimeImpl {
120120
llvm::Optional<unsigned> GetNumChildren(CompilerType type,
121121
ValueObject *valobj);
122122

123-
llvm::Optional<size_t>
124-
GetIndexOfChildMemberWithName(CompilerType type, llvm::StringRef name,
125-
ExecutionContext *exe_ctx,
126-
bool omit_empty_base_classes,
127-
llvm::MutableArrayRef<uint32_t> child_indexes);
123+
llvm::Optional<size_t> GetIndexOfChildMemberWithName(
124+
CompilerType type, llvm::StringRef name, ExecutionContext *exe_ctx,
125+
bool omit_empty_base_classes, std::vector<uint32_t> &child_indexes);
128126

129127
CompilerType GetChildCompilerTypeAtIndex(
130128
CompilerType type, size_t idx, bool transparent_pointers,

0 commit comments

Comments
 (0)