Skip to content

Commit 7060243

Browse files
author
Zachary Turner
committed
Try to fix build errors on Android.
It doesn't like the implicit conversion from T[] to ArrayRef<T> so I'm using `llvm::makeArrayRef()`. Hopefully I got everything. llvm-svn: 282195
1 parent 29e93f3 commit 7060243

32 files changed

+85
-87
lines changed

‎lldb/source/Commands/CommandObjectArgs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void CommandObjectArgs::CommandOptions::OptionParsingStarting(
6969

7070
llvm::ArrayRef<OptionDefinition>
7171
CommandObjectArgs::CommandOptions::GetDefinitions() {
72-
return g_arg_options;
72+
return llvm::makeArrayRef(g_arg_options);
7373
}
7474

7575
CommandObjectArgs::CommandObjectArgs(CommandInterpreter &interpreter)

‎lldb/source/Commands/CommandObjectBreakpoint.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ class CommandObjectBreakpointSet : public CommandObjectParsed {
456456
}
457457

458458
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
459-
return g_breakpoint_set_options;
459+
return llvm::makeArrayRef(g_breakpoint_set_options);
460460
}
461461

462462
// Instance variables to hold the values for command options.
@@ -962,7 +962,7 @@ class CommandObjectBreakpointModify : public CommandObjectParsed {
962962
}
963963

964964
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
965-
return g_breakpoint_modify_options;
965+
return llvm::makeArrayRef(g_breakpoint_modify_options);
966966
}
967967

968968
// Instance variables to hold the values for command options.
@@ -1363,7 +1363,7 @@ class CommandObjectBreakpointList : public CommandObjectParsed {
13631363
}
13641364

13651365
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1366-
return g_breakpoint_list_options;
1366+
return llvm::makeArrayRef(g_breakpoint_list_options);
13671367
}
13681368

13691369
// Instance variables to hold the values for command options.
@@ -1502,7 +1502,7 @@ class CommandObjectBreakpointClear : public CommandObjectParsed {
15021502
}
15031503

15041504
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1505-
return g_breakpoint_clear_options;
1505+
return llvm::makeArrayRef(g_breakpoint_clear_options);
15061506
}
15071507

15081508
// Instance variables to hold the values for command options.
@@ -1661,7 +1661,7 @@ class CommandObjectBreakpointDelete : public CommandObjectParsed {
16611661
}
16621662

16631663
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1664-
return g_breakpoint_delete_options;
1664+
return llvm::makeArrayRef(g_breakpoint_delete_options);
16651665
}
16661666

16671667
// Instance variables to hold the values for command options.
@@ -1769,7 +1769,7 @@ class BreakpointNameOptionGroup : public OptionGroup {
17691769
~BreakpointNameOptionGroup() override = default;
17701770

17711771
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1772-
return g_breakpoint_name_options;
1772+
return llvm::makeArrayRef(g_breakpoint_name_options);
17731773
}
17741774

17751775
Error SetOptionValue(uint32_t option_idx, const char *option_value,
@@ -2135,7 +2135,7 @@ class CommandObjectBreakpointRead : public CommandObjectParsed {
21352135
}
21362136

21372137
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
2138-
return g_breakpoint_read_options;
2138+
return llvm::makeArrayRef(g_breakpoint_read_options);
21392139
}
21402140

21412141
// Instance variables to hold the values for command options.
@@ -2230,7 +2230,7 @@ class CommandObjectBreakpointWrite : public CommandObjectParsed {
22302230
}
22312231

22322232
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
2233-
return g_breakpoint_write_options;
2233+
return llvm::makeArrayRef(g_breakpoint_write_options);
22342234
}
22352235

22362236
// Instance variables to hold the values for command options.

‎lldb/source/Commands/CommandObjectBreakpointCommand.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ are no syntax errors may indicate that a function was declared but never called.
349349
}
350350

351351
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
352-
return g_breakpoint_add_options;
352+
return llvm::makeArrayRef(g_breakpoint_add_options);
353353
}
354354

355355
// Instance variables to hold the values for command options.
@@ -541,7 +541,7 @@ class CommandObjectBreakpointCommandDelete : public CommandObjectParsed {
541541
}
542542

543543
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
544-
return g_breakpoint_delete_options;
544+
return llvm::makeArrayRef(g_breakpoint_delete_options);
545545
}
546546

547547
// Instance variables to hold the values for command options.

‎lldb/source/Commands/CommandObjectCommands.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class CommandObjectCommandsHistory : public CommandObjectParsed {
108108
}
109109

110110
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
111-
return g_history_options;
111+
return llvm::makeArrayRef(g_history_options);
112112
}
113113

114114
// Instance variables to hold the values for command options.
@@ -290,7 +290,7 @@ class CommandObjectCommandsSource : public CommandObjectParsed {
290290
}
291291

292292
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
293-
return g_source_options;
293+
return llvm::makeArrayRef(g_source_options);
294294
}
295295

296296
// Instance variables to hold the values for command options.
@@ -368,7 +368,7 @@ class CommandObjectCommandsAlias : public CommandObjectRaw {
368368
~CommandOptions() override = default;
369369

370370
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
371-
return g_alias_options;
371+
return llvm::makeArrayRef(g_alias_options);
372372
}
373373

374374
Error SetOptionValue(uint32_t option_idx, const char *option_value,
@@ -1244,7 +1244,7 @@ a number follows 'f':"
12441244
}
12451245

12461246
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1247-
return g_regex_options;
1247+
return llvm::makeArrayRef(g_regex_options);
12481248
}
12491249

12501250
const char *GetHelp() {
@@ -1508,7 +1508,7 @@ class CommandObjectCommandsScriptImport : public CommandObjectParsed {
15081508
}
15091509

15101510
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1511-
return g_script_import_options;
1511+
return llvm::makeArrayRef(g_script_import_options);
15121512
}
15131513

15141514
// Instance variables to hold the values for command options.
@@ -1667,7 +1667,7 @@ class CommandObjectCommandsScriptAdd : public CommandObjectParsed,
16671667
}
16681668

16691669
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1670-
return g_script_add_options;
1670+
return llvm::makeArrayRef(g_script_add_options);
16711671
}
16721672

16731673
// Instance variables to hold the values for command options.

‎lldb/source/Commands/CommandObjectDisassemble.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ Error CommandObjectDisassemble::CommandOptions::OptionParsingFinished(
236236

237237
llvm::ArrayRef<OptionDefinition>
238238
CommandObjectDisassemble::CommandOptions::GetDefinitions() {
239-
return g_disassemble_options;
239+
return llvm::makeArrayRef(g_disassemble_options);
240240
}
241241

242242
//-------------------------------------------------------------------------

‎lldb/source/Commands/CommandObjectExpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void CommandObjectExpression::CommandOptions::OptionParsingStarting(
208208

209209
llvm::ArrayRef<OptionDefinition>
210210
CommandObjectExpression::CommandOptions::GetDefinitions() {
211-
return g_expression_options;
211+
return llvm::makeArrayRef(g_expression_options);
212212
}
213213

214214
CommandObjectExpression::CommandObjectExpression(

‎lldb/source/Commands/CommandObjectFrame.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class CommandObjectFrameDiagnose : public CommandObjectParsed {
124124
}
125125

126126
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
127-
return g_frame_diag_options;
127+
return llvm::makeArrayRef(g_frame_diag_options);
128128
}
129129

130130
// Options.
@@ -296,7 +296,7 @@ class CommandObjectFrameSelect : public CommandObjectParsed {
296296
}
297297

298298
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
299-
return g_frame_select_options;
299+
return llvm::makeArrayRef(g_frame_select_options);
300300
}
301301

302302
int32_t relative_frame_offset;

‎lldb/source/Commands/CommandObjectHelp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static OptionDefinition g_help_options[] = {
7676

7777
llvm::ArrayRef<OptionDefinition>
7878
CommandObjectHelp::CommandOptions::GetDefinitions() {
79-
return g_help_options;
79+
return llvm::makeArrayRef(g_help_options);
8080
}
8181

8282
bool CommandObjectHelp::DoExecute(Args &command, CommandReturnObject &result) {

‎lldb/source/Commands/CommandObjectLog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class CommandObjectLogEnable : public CommandObjectParsed {
167167
}
168168

169169
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
170-
return g_log_options;
170+
return llvm::makeArrayRef(g_log_options);
171171
}
172172

173173
// Instance variables to hold the values for command options.

‎lldb/source/Commands/CommandObjectMemory.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class OptionGroupReadMemory : public OptionGroup {
7070
~OptionGroupReadMemory() override = default;
7171

7272
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
73-
return g_read_memory_options;
73+
return llvm::makeArrayRef(g_read_memory_options);
7474
}
7575

7676
Error SetOptionValue(uint32_t option_idx, const char *option_arg,
@@ -905,7 +905,7 @@ class CommandObjectMemoryFind : public CommandObjectParsed {
905905
~OptionGroupFindMemory() override = default;
906906

907907
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
908-
return g_memory_find_option_table;
908+
return llvm::makeArrayRef(g_memory_find_option_table);
909909
}
910910

911911
Error SetOptionValue(uint32_t option_idx, const char *option_arg,
@@ -1201,7 +1201,7 @@ class CommandObjectMemoryWrite : public CommandObjectParsed {
12011201
~OptionGroupWriteMemory() override = default;
12021202

12031203
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1204-
return g_memory_write_option_table;
1204+
return llvm::makeArrayRef(g_memory_write_option_table);
12051205
}
12061206

12071207
Error SetOptionValue(uint32_t option_idx, const char *option_arg,

‎lldb/source/Commands/CommandObjectPlatform.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class OptionPermissions : public lldb_private::OptionGroup {
145145
}
146146

147147
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
148-
return g_permissions_options;
148+
return llvm::makeArrayRef(g_permissions_options);
149149
}
150150

151151
// Instance variables to hold the values for command options.
@@ -698,7 +698,7 @@ class CommandObjectPlatformFRead : public CommandObjectParsed {
698698
}
699699

700700
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
701-
return g_platform_fread_options;
701+
return llvm::makeArrayRef(g_platform_fread_options);
702702
}
703703

704704
// Instance variables to hold the values for command options.
@@ -791,7 +791,7 @@ class CommandObjectPlatformFWrite : public CommandObjectParsed {
791791
}
792792

793793
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
794-
return g_platform_fwrite_options;
794+
return llvm::makeArrayRef(g_platform_fwrite_options);
795795
}
796796

797797
// Instance variables to hold the values for command options.
@@ -1108,7 +1108,7 @@ class CommandObjectPlatformProcessLaunch : public CommandObjectParsed {
11081108
// "platform process list"
11091109
//----------------------------------------------------------------------
11101110

1111-
OptionDefinition g_platform_process_list_option_array[] = {
1111+
OptionDefinition g_platform_process_list_options[] = {
11121112
// clang-format off
11131113
{ LLDB_OPT_SET_1, false, "pid", 'p', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypePid, "List the process info for a specific process ID." },
11141114
{ LLDB_OPT_SET_2, true, "name", 'n', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeProcessName, "Find processes with executable basenames that match a string." },
@@ -1126,8 +1126,6 @@ OptionDefinition g_platform_process_list_option_array[] = {
11261126
{ LLDB_OPT_SET_FROM_TO(1, 6), false, "verbose", 'v', OptionParser::eNoArgument, nullptr, nullptr, 0, eArgTypeNone, "Enable verbose output." },
11271127
// clang-format on
11281128
};
1129-
llvm::MutableArrayRef<OptionDefinition>
1130-
g_platform_process_list_options(g_platform_process_list_option_array);
11311129

11321130
class CommandObjectPlatformProcessList : public CommandObjectParsed {
11331131
public:
@@ -1395,7 +1393,7 @@ class CommandObjectPlatformProcessList : public CommandObjectParsed {
13951393
}
13961394

13971395
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1398-
return g_platform_process_list_options;
1396+
return llvm::makeArrayRef(g_platform_process_list_options);
13991397
}
14001398

14011399
// Instance variables to hold the values for command options.
@@ -1560,7 +1558,7 @@ class CommandObjectPlatformProcessAttach : public CommandObjectParsed {
15601558
}
15611559

15621560
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1563-
return g_platform_process_attach_options;
1561+
return llvm::makeArrayRef(g_platform_process_attach_options);
15641562
}
15651563

15661564
bool HandleOptionArgumentCompletion(
@@ -1702,7 +1700,7 @@ class CommandObjectPlatformShell : public CommandObjectRaw {
17021700
~CommandOptions() override = default;
17031701

17041702
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1705-
return g_platform_shell_options;
1703+
return llvm::makeArrayRef(g_platform_shell_options);
17061704
}
17071705

17081706
Error SetOptionValue(uint32_t option_idx, const char *option_value,

‎lldb/source/Commands/CommandObjectProcess.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ class CommandObjectProcessAttach : public CommandObjectProcessLaunchOrAttach {
386386
}
387387

388388
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
389-
return g_process_attach_options;
389+
return llvm::makeArrayRef(g_process_attach_options);
390390
}
391391

392392
bool HandleOptionArgumentCompletion(
@@ -631,7 +631,7 @@ class CommandObjectProcessContinue : public CommandObjectParsed {
631631
}
632632

633633
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
634-
return g_process_continue_options;
634+
return llvm::makeArrayRef(g_process_continue_options);
635635
}
636636

637637
uint32_t m_ignore;
@@ -789,7 +789,7 @@ class CommandObjectProcessDetach : public CommandObjectParsed {
789789
}
790790

791791
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
792-
return g_process_detach_options;
792+
return llvm::makeArrayRef(g_process_detach_options);
793793
}
794794

795795
// Instance variables to hold the values for command options.
@@ -882,7 +882,7 @@ class CommandObjectProcessConnect : public CommandObjectParsed {
882882
}
883883

884884
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
885-
return g_process_connect_options;
885+
return llvm::makeArrayRef(g_process_connect_options);
886886
}
887887

888888
// Instance variables to hold the values for command options.
@@ -1012,7 +1012,7 @@ class CommandObjectProcessLoad : public CommandObjectParsed {
10121012
}
10131013

10141014
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1015-
return g_process_load_options;
1015+
return llvm::makeArrayRef(g_process_load_options);
10161016
}
10171017

10181018
// Instance variables to hold the values for command options.
@@ -1414,7 +1414,7 @@ class CommandObjectProcessHandle : public CommandObjectParsed {
14141414
}
14151415

14161416
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
1417-
return g_process_handle_options;
1417+
return llvm::makeArrayRef(g_process_handle_options);
14181418
}
14191419

14201420
// Instance variables to hold the values for command options.

‎lldb/source/Commands/CommandObjectRegister.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class CommandObjectRegisterRead : public CommandObjectParsed {
251251
~CommandOptions() override = default;
252252

253253
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
254-
return g_register_read_options;
254+
return llvm::makeArrayRef(g_register_read_options);
255255
}
256256

257257
void OptionParsingStarting(ExecutionContext *execution_context) override {

‎lldb/source/Commands/CommandObjectSettings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ insert-before or insert-after.");
125125
}
126126

127127
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
128-
return g_settings_set_options;
128+
return llvm::makeArrayRef(g_settings_set_options);
129129
}
130130

131131
// Instance variables to hold the values for command options.

‎lldb/source/Commands/CommandObjectSource.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class CommandObjectSourceInfo : public CommandObjectParsed {
121121
}
122122

123123
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
124-
return g_source_info_options;
124+
return llvm::makeArrayRef(g_source_info_options);
125125
}
126126

127127
// Instance variables to hold the values for command options.
@@ -749,7 +749,7 @@ class CommandObjectSourceList : public CommandObjectParsed {
749749
}
750750

751751
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
752-
return g_source_list_options;
752+
return llvm::makeArrayRef(g_source_list_options);
753753
}
754754

755755
// Instance variables to hold the values for command options.

0 commit comments

Comments
 (0)