Merge commit '3647ff159a2f' from llvm.org/main into next

Author: git apple-llvm automerger

lldb/source/Commands/CommandObjectCommands.cpp

@@ -1419,9 +1419,9 @@ class CommandObjectScriptingObjectParsed : public CommandObjectParsed {
       m_options_definition_up.reset(new OptionDefinition[m_num_options]);
       // We need to hand out pointers to contents of these vectors; we reserve
       // as much as we'll need up front so they don't get freed on resize...
-      m_usage_container.reserve(m_num_options);
-      m_enum_storage.reserve(m_num_options);
-      m_enum_vector.reserve(m_num_options);
+      m_usage_container.resize(m_num_options);
+      m_enum_storage.resize(m_num_options);
+      m_enum_vector.resize(m_num_options);
 
       size_t counter = 0;
       size_t short_opt_counter = 0;

lldb/test/API/commands/command/script/add/TestAddParsedCommand.py

@@ -15,7 +15,6 @@ class ParsedCommandTestCase(TestBase):
 
     # This crashes on the x86_64 Debian bot, but the failure is not helpful.
     # Disable the test while I try to find a way to reproduce.
-    @skipIfLinux 
     def test(self):
         self.pycmd_tests()