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

diff --git a/lldb/source/Commands/CommandObjectArgs.cpp b/lldb/source/Commands/CommandObjectArgs.cpp
index 6cd7529..59b9c5a 100644 (file)
--- a/lldb/source/Commands/CommandObjectArgs.cpp
+++ b/lldb/source/Commands/CommandObjectArgs.cpp
@@ -69,7 +69,7 @@ void CommandObjectArgs::CommandOptions::OptionParsingStarting(
 
 llvm::ArrayRef<OptionDefinition>
 CommandObjectArgs::CommandOptions::GetDefinitions() {
-  return g_arg_options;
+  return llvm::makeArrayRef(g_arg_options);
 }
 
 CommandObjectArgs::CommandObjectArgs(CommandInterpreter &interpreter)

diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp
index b68203c..13235d7 100644 (file)
--- a/lldb/source/Commands/CommandObjectBreakpoint.cpp
+++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp
@@ -456,7 +456,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_set_options;
+      return llvm::makeArrayRef(g_breakpoint_set_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -962,7 +962,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_modify_options;
+      return llvm::makeArrayRef(g_breakpoint_modify_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1363,7 +1363,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_list_options;
+      return llvm::makeArrayRef(g_breakpoint_list_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1502,7 +1502,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_clear_options;
+      return llvm::makeArrayRef(g_breakpoint_clear_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1661,7 +1661,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_delete_options;
+      return llvm::makeArrayRef(g_breakpoint_delete_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1769,7 +1769,7 @@ public:
   ~BreakpointNameOptionGroup() override = default;
 
   llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-    return g_breakpoint_name_options;
+    return llvm::makeArrayRef(g_breakpoint_name_options);
   }
 
   Error SetOptionValue(uint32_t option_idx, const char *option_value,
@@ -2135,7 +2135,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_read_options;
+      return llvm::makeArrayRef(g_breakpoint_read_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -2230,7 +2230,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_write_options;
+      return llvm::makeArrayRef(g_breakpoint_write_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
index 90e6b23..e0a146f 100644 (file)
--- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
+++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
@@ -349,7 +349,7 @@ are no syntax errors may indicate that a function was declared but never called.
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_add_options;
+      return llvm::makeArrayRef(g_breakpoint_add_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -541,7 +541,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_breakpoint_delete_options;
+      return llvm::makeArrayRef(g_breakpoint_delete_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp
index 74f0362..ed36733 100644 (file)
--- a/lldb/source/Commands/CommandObjectCommands.cpp
+++ b/lldb/source/Commands/CommandObjectCommands.cpp
@@ -108,7 +108,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_history_options;
+      return llvm::makeArrayRef(g_history_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -290,7 +290,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_source_options;
+      return llvm::makeArrayRef(g_source_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -368,7 +368,7 @@ protected:
     ~CommandOptions() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_alias_options;
+      return llvm::makeArrayRef(g_alias_options);
     }
 
     Error SetOptionValue(uint32_t option_idx, const char *option_value,
@@ -1244,7 +1244,7 @@ private:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_regex_options;
+      return llvm::makeArrayRef(g_regex_options);
     }
 
     const char *GetHelp() {
@@ -1508,7 +1508,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_script_import_options;
+      return llvm::makeArrayRef(g_script_import_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1667,7 +1667,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_script_add_options;
+      return llvm::makeArrayRef(g_script_add_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp
index ff8b782..93fda55 100644 (file)
--- a/lldb/source/Commands/CommandObjectDisassemble.cpp
+++ b/lldb/source/Commands/CommandObjectDisassemble.cpp
@@ -236,7 +236,7 @@ Error CommandObjectDisassemble::CommandOptions::OptionParsingFinished(
 
 llvm::ArrayRef<OptionDefinition>
 CommandObjectDisassemble::CommandOptions::GetDefinitions() {
-  return g_disassemble_options;
+  return llvm::makeArrayRef(g_disassemble_options);
 }
 
 //-------------------------------------------------------------------------

diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index b2b1ed3..4a041df 100644 (file)
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -208,7 +208,7 @@ void CommandObjectExpression::CommandOptions::OptionParsingStarting(
 
 llvm::ArrayRef<OptionDefinition>
 CommandObjectExpression::CommandOptions::GetDefinitions() {
-  return g_expression_options;
+  return llvm::makeArrayRef(g_expression_options);
 }
 
 CommandObjectExpression::CommandObjectExpression(

diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp
index af954ec..8688f03 100644 (file)
--- a/lldb/source/Commands/CommandObjectFrame.cpp
+++ b/lldb/source/Commands/CommandObjectFrame.cpp
@@ -124,7 +124,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_frame_diag_options;
+      return llvm::makeArrayRef(g_frame_diag_options);
     }
 
     // Options.
@@ -296,7 +296,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_frame_select_options;
+      return llvm::makeArrayRef(g_frame_select_options);
     }
 
     int32_t relative_frame_offset;

diff --git a/lldb/source/Commands/CommandObjectHelp.cpp b/lldb/source/Commands/CommandObjectHelp.cpp
index aa611ce..d03b5cd 100644 (file)
--- a/lldb/source/Commands/CommandObjectHelp.cpp
+++ b/lldb/source/Commands/CommandObjectHelp.cpp
@@ -76,7 +76,7 @@ static OptionDefinition g_help_options[] = {
 
 llvm::ArrayRef<OptionDefinition>
 CommandObjectHelp::CommandOptions::GetDefinitions() {
-  return g_help_options;
+  return llvm::makeArrayRef(g_help_options);
 }
 
 bool CommandObjectHelp::DoExecute(Args &command, CommandReturnObject &result) {

diff --git a/lldb/source/Commands/CommandObjectLog.cpp b/lldb/source/Commands/CommandObjectLog.cpp
index 29b937f..350f8d0 100644 (file)
--- a/lldb/source/Commands/CommandObjectLog.cpp
+++ b/lldb/source/Commands/CommandObjectLog.cpp
@@ -167,7 +167,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_log_options;
+      return llvm::makeArrayRef(g_log_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp
index 4be666e..c35f7b4 100644 (file)
--- a/lldb/source/Commands/CommandObjectMemory.cpp
+++ b/lldb/source/Commands/CommandObjectMemory.cpp
@@ -70,7 +70,7 @@ public:
   ~OptionGroupReadMemory() override = default;
 
   llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-    return g_read_memory_options;
+    return llvm::makeArrayRef(g_read_memory_options);
   }
 
   Error SetOptionValue(uint32_t option_idx, const char *option_arg,
@@ -905,7 +905,7 @@ public:
     ~OptionGroupFindMemory() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_memory_find_option_table;
+      return llvm::makeArrayRef(g_memory_find_option_table);
     }
 
     Error SetOptionValue(uint32_t option_idx, const char *option_arg,
@@ -1201,7 +1201,7 @@ public:
     ~OptionGroupWriteMemory() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_memory_write_option_table;
+      return llvm::makeArrayRef(g_memory_write_option_table);
     }
 
     Error SetOptionValue(uint32_t option_idx, const char *option_arg,

diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp
index db3e2ab..bc52af8 100644 (file)
--- a/lldb/source/Commands/CommandObjectPlatform.cpp
+++ b/lldb/source/Commands/CommandObjectPlatform.cpp
@@ -145,7 +145,7 @@ public:
   }
 
   llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-    return g_permissions_options;
+    return llvm::makeArrayRef(g_permissions_options);
   }
 
   // Instance variables to hold the values for command options.
@@ -698,7 +698,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_platform_fread_options;
+      return llvm::makeArrayRef(g_platform_fread_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -791,7 +791,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_platform_fwrite_options;
+      return llvm::makeArrayRef(g_platform_fwrite_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1108,7 +1108,7 @@ protected:
 // "platform process list"
 //----------------------------------------------------------------------
 
-OptionDefinition g_platform_process_list_option_array[] = {
+OptionDefinition g_platform_process_list_options[] = {
     // clang-format off
   { LLDB_OPT_SET_1,             false, "pid",         'p', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypePid,               "List the process info for a specific process ID." },
   { 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[] = {
   { LLDB_OPT_SET_FROM_TO(1, 6), false, "verbose",     'v', OptionParser::eNoArgument,       nullptr, nullptr, 0, eArgTypeNone,              "Enable verbose output." },
     // clang-format on
 };
-llvm::MutableArrayRef<OptionDefinition>
-    g_platform_process_list_options(g_platform_process_list_option_array);
 
 class CommandObjectPlatformProcessList : public CommandObjectParsed {
 public:
@@ -1395,7 +1393,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_platform_process_list_options;
+      return llvm::makeArrayRef(g_platform_process_list_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1560,7 +1558,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_platform_process_attach_options;
+      return llvm::makeArrayRef(g_platform_process_attach_options);
     }
 
     bool HandleOptionArgumentCompletion(
@@ -1702,7 +1700,7 @@ public:
     ~CommandOptions() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_platform_shell_options;
+      return llvm::makeArrayRef(g_platform_shell_options);
     }
 
     Error SetOptionValue(uint32_t option_idx, const char *option_value,

diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index 582e898..e47ac0d 100644 (file)
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -386,7 +386,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_process_attach_options;
+      return llvm::makeArrayRef(g_process_attach_options);
     }
 
     bool HandleOptionArgumentCompletion(
@@ -631,7 +631,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_process_continue_options;
+      return llvm::makeArrayRef(g_process_continue_options);
     }
 
     uint32_t m_ignore;
@@ -789,7 +789,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_process_detach_options;
+      return llvm::makeArrayRef(g_process_detach_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -882,7 +882,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_process_connect_options;
+      return llvm::makeArrayRef(g_process_connect_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1012,7 +1012,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_process_load_options;
+      return llvm::makeArrayRef(g_process_load_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1414,7 +1414,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_process_handle_options;
+      return llvm::makeArrayRef(g_process_handle_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectRegister.cpp b/lldb/source/Commands/CommandObjectRegister.cpp
index 8ee6c65..fe74d26 100644 (file)
--- a/lldb/source/Commands/CommandObjectRegister.cpp
+++ b/lldb/source/Commands/CommandObjectRegister.cpp
@@ -251,7 +251,7 @@ protected:
     ~CommandOptions() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_register_read_options;
+      return llvm::makeArrayRef(g_register_read_options);
     }
 
     void OptionParsingStarting(ExecutionContext *execution_context) override {

diff --git a/lldb/source/Commands/CommandObjectSettings.cpp b/lldb/source/Commands/CommandObjectSettings.cpp
index f1420a2..f31e242 100644 (file)
--- a/lldb/source/Commands/CommandObjectSettings.cpp
+++ b/lldb/source/Commands/CommandObjectSettings.cpp
@@ -125,7 +125,7 @@ insert-before or insert-after.");
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_settings_set_options;
+      return llvm::makeArrayRef(g_settings_set_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp
index c03c724..55e724a 100644 (file)
--- a/lldb/source/Commands/CommandObjectSource.cpp
+++ b/lldb/source/Commands/CommandObjectSource.cpp
@@ -121,7 +121,7 @@ class CommandObjectSourceInfo : public CommandObjectParsed {
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_source_info_options;
+      return llvm::makeArrayRef(g_source_info_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -749,7 +749,7 @@ class CommandObjectSourceList : public CommandObjectParsed {
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_source_list_options;
+      return llvm::makeArrayRef(g_source_list_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index 407aeac..d794c91 100644 (file)
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -1997,7 +1997,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_target_modules_dump_symtab_options;
+      return llvm::makeArrayRef(g_target_modules_dump_symtab_options);
     }
 
     SortOrder m_sort_order;
@@ -2828,7 +2828,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_target_modules_list_options;
+      return llvm::makeArrayRef(g_target_modules_list_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -3202,7 +3202,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_target_modules_show_unwind_options;
+      return llvm::makeArrayRef(g_target_modules_show_unwind_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -3553,7 +3553,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_target_modules_lookup_options;
+      return llvm::makeArrayRef(g_target_modules_lookup_options);
     }
 
     int m_type;        // Should be a eLookupTypeXXX enum after parsing options
@@ -4343,7 +4343,7 @@ public:
     ~CommandOptions() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_target_stop_hook_add_options;
+      return llvm::makeArrayRef(g_target_stop_hook_add_options);
     }
 
     Error SetOptionValue(uint32_t option_idx, const char *option_arg,

diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp
index fdcd4b1..136f003 100644 (file)
--- a/lldb/source/Commands/CommandObjectThread.cpp
+++ b/lldb/source/Commands/CommandObjectThread.cpp
@@ -210,7 +210,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_thread_backtrace_options;
+      return llvm::makeArrayRef(g_thread_backtrace_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -437,7 +437,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_thread_step_scope_options;
+      return llvm::makeArrayRef(g_thread_step_scope_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -982,7 +982,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_thread_until_options;
+      return llvm::makeArrayRef(g_thread_until_options);
     }
 
     uint32_t m_step_thread_idx;
@@ -1363,7 +1363,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_thread_info_options;
+      return llvm::makeArrayRef(g_thread_info_options);
     }
 
     bool m_json_thread;
@@ -1465,7 +1465,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_thread_return_options;
+      return llvm::makeArrayRef(g_thread_return_options);
     }
 
     bool m_from_expression;
@@ -1655,7 +1655,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_thread_jump_options;
+      return llvm::makeArrayRef(g_thread_jump_options);
     }
 
     FileSpecList m_filenames;
@@ -1793,7 +1793,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_thread_plan_list_options;
+      return llvm::makeArrayRef(g_thread_plan_list_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectType.cpp b/lldb/source/Commands/CommandObjectType.cpp
index 9df1da6..4f470f0 100644 (file)
--- a/lldb/source/Commands/CommandObjectType.cpp
+++ b/lldb/source/Commands/CommandObjectType.cpp
@@ -132,7 +132,7 @@ private:
     void OptionParsingStarting(ExecutionContext *execution_context) override;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_summary_add_options;
+      return llvm::makeArrayRef(g_type_summary_add_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -374,7 +374,7 @@ private:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_synth_add_options;
+      return llvm::makeArrayRef(g_type_synth_add_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -550,7 +550,7 @@ private:
     ~CommandOptions() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_format_add_options;
+      return llvm::makeArrayRef(g_type_format_add_options);
     }
 
     void OptionParsingStarting(ExecutionContext *execution_context) override {
@@ -802,7 +802,7 @@ protected:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_formatter_delete_options;
+      return llvm::makeArrayRef(g_type_formatter_delete_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -934,7 +934,7 @@ private:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_formatter_clear_options;
+      return llvm::makeArrayRef(g_type_formatter_clear_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1834,7 +1834,7 @@ class CommandObjectTypeCategoryDefine : public CommandObjectParsed {
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_category_define_options;
+      return llvm::makeArrayRef(g_type_category_define_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -1940,7 +1940,7 @@ class CommandObjectTypeCategoryEnable : public CommandObjectParsed {
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_category_enable_options;
+      return llvm::makeArrayRef(g_type_category_enable_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -2117,7 +2117,7 @@ class CommandObjectTypeCategoryDisable : public CommandObjectParsed {
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_category_disable_options;
+      return llvm::makeArrayRef(g_type_category_disable_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -2575,7 +2575,7 @@ private:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_filter_add_options;
+      return llvm::makeArrayRef(g_type_filter_add_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -2799,7 +2799,7 @@ protected:
     ~CommandOptions() override = default;
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_type_lookup_options;
+      return llvm::makeArrayRef(g_type_lookup_options);
     }
 
     Error SetOptionValue(uint32_t option_idx, const char *option_value,

diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp
index 83eb1dd..8e3f8e2 100644 (file)
--- a/lldb/source/Commands/CommandObjectWatchpoint.cpp
+++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp
@@ -226,7 +226,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_watchpoint_list_options;
+      return llvm::makeArrayRef(g_watchpoint_list_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -587,7 +587,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_watchpoint_ignore_options;
+      return llvm::makeArrayRef(g_watchpoint_ignore_options);
     }
 
     // Instance variables to hold the values for command options.
@@ -718,7 +718,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_watchpoint_modify_options;
+      return llvm::makeArrayRef(g_watchpoint_modify_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Commands/CommandObjectWatchpointCommand.cpp b/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
index a0214ad..9377d2a 100644 (file)
--- a/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
+++ b/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
@@ -371,7 +371,7 @@ are no syntax errors may indicate that a function was declared but never called.
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_watchpoint_command_add_options;
+      return llvm::makeArrayRef(g_watchpoint_command_add_options);
     }
 
     // Instance variables to hold the values for command options.

diff --git a/lldb/source/Interpreter/OptionGroupArchitecture.cpp b/lldb/source/Interpreter/OptionGroupArchitecture.cpp
index 870afb2..2ebd762 100644 (file)
--- a/lldb/source/Interpreter/OptionGroupArchitecture.cpp
+++ b/lldb/source/Interpreter/OptionGroupArchitecture.cpp
@@ -29,7 +29,7 @@ static OptionDefinition g_option_table[] = {
 };
 
 llvm::ArrayRef<OptionDefinition> OptionGroupArchitecture::GetDefinitions() {
-  return g_option_table;
+  return llvm::makeArrayRef(g_option_table);
 }
 
 bool OptionGroupArchitecture::GetArchitecture(Platform *platform,

diff --git a/lldb/source/Interpreter/OptionGroupFormat.cpp b/lldb/source/Interpreter/OptionGroupFormat.cpp
index b0628ff..0e5cd2b 100644 (file)
--- a/lldb/source/Interpreter/OptionGroupFormat.cpp
+++ b/lldb/source/Interpreter/OptionGroupFormat.cpp
@@ -48,7 +48,7 @@ static OptionDefinition g_option_table[] = {
 };
 
 llvm::ArrayRef<OptionDefinition> OptionGroupFormat::GetDefinitions() {
-  llvm::ArrayRef<OptionDefinition> result = g_option_table;
+  auto result = llvm::makeArrayRef(g_option_table);
   if (m_byte_size.GetDefaultValue() < UINT64_MAX) {
     if (m_count.GetDefaultValue() < UINT64_MAX)
       return result;

diff --git a/lldb/source/Interpreter/OptionGroupOutputFile.cpp b/lldb/source/Interpreter/OptionGroupOutputFile.cpp
index d01f7db..048036b 100644 (file)
--- a/lldb/source/Interpreter/OptionGroupOutputFile.cpp
+++ b/lldb/source/Interpreter/OptionGroupOutputFile.cpp
@@ -35,7 +35,7 @@ static OptionDefinition g_option_table[] = {
 };
 
 llvm::ArrayRef<OptionDefinition> OptionGroupOutputFile::GetDefinitions() {
-  return g_option_table;
+  return llvm::makeArrayRef(g_option_table);
 }
 
 Error OptionGroupOutputFile::SetOptionValue(

diff --git a/lldb/source/Interpreter/OptionGroupUUID.cpp b/lldb/source/Interpreter/OptionGroupUUID.cpp
index 778ade9..ddcbdff 100644 (file)
--- a/lldb/source/Interpreter/OptionGroupUUID.cpp
+++ b/lldb/source/Interpreter/OptionGroupUUID.cpp
@@ -28,7 +28,7 @@ static OptionDefinition g_option_table[] = {
 };
 
 llvm::ArrayRef<OptionDefinition> OptionGroupUUID::GetDefinitions() {
-  return g_option_table;
+  return llvm::makeArrayRef(g_option_table);
 }
 
 Error OptionGroupUUID::SetOptionValue(uint32_t option_idx,

diff --git a/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp b/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
index 70fa219..52d0565 100644 (file)
--- a/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
+++ b/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
@@ -73,7 +73,7 @@ static OptionDefinition g_option_table[] = {
 
 llvm::ArrayRef<OptionDefinition>
 OptionGroupValueObjectDisplay::GetDefinitions() {
-  return g_option_table;
+  return llvm::makeArrayRef(g_option_table);
 }
 
 Error OptionGroupValueObjectDisplay::SetOptionValue(

diff --git a/lldb/source/Interpreter/OptionGroupVariable.cpp b/lldb/source/Interpreter/OptionGroupVariable.cpp
index f26d367..e60daac 100644 (file)
--- a/lldb/source/Interpreter/OptionGroupVariable.cpp
+++ b/lldb/source/Interpreter/OptionGroupVariable.cpp
@@ -130,7 +130,7 @@ void OptionGroupVariable::OptionParsingStarting(
 #define NUM_FRAME_OPTS 3
 
 llvm::ArrayRef<OptionDefinition> OptionGroupVariable::GetDefinitions() {
-  llvm::ArrayRef<OptionDefinition> result = g_variable_options;
+  auto result = llvm::makeArrayRef(g_variable_options);
   // Show the "--no-args", "--no-locals" and "--show-globals"
   // options if we are showing frame specific options
   if (include_frame_options)

diff --git a/lldb/source/Interpreter/OptionGroupWatchpoint.cpp b/lldb/source/Interpreter/OptionGroupWatchpoint.cpp
index 15f4c23..f69dae6 100644 (file)
--- a/lldb/source/Interpreter/OptionGroupWatchpoint.cpp
+++ b/lldb/source/Interpreter/OptionGroupWatchpoint.cpp
@@ -94,5 +94,5 @@ void OptionGroupWatchpoint::OptionParsingStarting(
 }
 
 llvm::ArrayRef<OptionDefinition> OptionGroupWatchpoint::GetDefinitions() {
-  return g_option_table;
+  return llvm::makeArrayRef(g_option_table);
 }

diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
index 7312dfc..78194f4 100644 (file)
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -507,7 +507,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_objc_classtable_dump_options;
+      return llvm::makeArrayRef(g_objc_classtable_dump_options);
     }
 
     OptionValueBoolean m_verbose;

diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
index 1e4d846..567921a 100644 (file)
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
@@ -3780,7 +3780,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_renderscript_kernel_bp_set_options;
+      return llvm::makeArrayRef(g_renderscript_kernel_bp_set_options);
     }
 
     std::array<int, 3> m_coord;
@@ -4039,7 +4039,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_renderscript_runtime_alloc_dump_options;
+      return llvm::makeArrayRef(g_renderscript_runtime_alloc_dump_options);
     }
 
     FileSpec m_outfile;
@@ -4161,7 +4161,7 @@ public:
     }
 
     llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      return g_renderscript_runtime_alloc_list_options;
+      return llvm::makeArrayRef(g_renderscript_runtime_alloc_list_options);
     }
 
     uint32_t m_id;

diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
index ff87150..4895962 100644 (file)
--- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
@@ -592,7 +592,7 @@ public:
   }
 
   llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-    return g_enable_option_table;
+    return llvm::makeArrayRef(g_enable_option_table);
   }
 
   StructuredData::DictionarySP BuildConfigurationData(bool enabled) {

diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
index 73f28ec..575492b 100644 (file)
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -1388,7 +1388,7 @@ static OptionDefinition g_caching_option_table[] = {
 };
 
 llvm::ArrayRef<OptionDefinition> OptionGroupPlatformRSync::GetDefinitions() {
-  return g_rsync_option_table;
+  return llvm::makeArrayRef(g_rsync_option_table);
 }
 
 void OptionGroupPlatformRSync::OptionParsingStarting(
@@ -1436,7 +1436,7 @@ Platform::SetThreadCreationBreakpoint(lldb_private::Target &target) {
 }
 
 llvm::ArrayRef<OptionDefinition> OptionGroupPlatformSSH::GetDefinitions() {
-  return g_ssh_option_table;
+  return llvm::makeArrayRef(g_ssh_option_table);
 }
 
 void OptionGroupPlatformSSH::OptionParsingStarting(
@@ -1469,7 +1469,7 @@ OptionGroupPlatformSSH::SetOptionValue(uint32_t option_idx,
 }
 
 llvm::ArrayRef<OptionDefinition> OptionGroupPlatformCaching::GetDefinitions() {
-  return g_caching_option_table;
+  return llvm::makeArrayRef(g_caching_option_table);
 }
 
 void OptionGroupPlatformCaching::OptionParsingStarting(

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 458cce0..4448ed0 100644 (file)
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -579,7 +579,7 @@ static OptionDefinition g_process_launch_options[] = {
 };
 
 llvm::ArrayRef<OptionDefinition> ProcessLaunchCommandOptions::GetDefinitions() {
-  return g_process_launch_options;
+  return llvm::makeArrayRef(g_process_launch_options);
 }
 
 bool ProcessInstanceInfoMatch::NameMatches(const char *process_name) const {