vendor/lldb/lldb-trunk-r338150

21 files changed, 172 insertions, 120 deletions

diff --git a/include/lldb/API/SBAddress.h b/include/lldb/API/SBAddress.h
index 9e697beffdd1d..02e847b97aa11 100644
--- a/include/lldb/API/SBAddress.h
+++ b/include/lldb/API/SBAddress.h
@@ -54,9 +54,9 @@ public:
   lldb::SBSymbolContext GetSymbolContext(uint32_t resolve_scope);
 
   // The following functions grab individual objects for a given address and
-  // are less efficient if you want more than one symbol related objects.
-  // Use one of the following when you want multiple debug symbol related
-  // objects for an address:
+  // are less efficient if you want more than one symbol related objects. Use
+  // one of the following when you want multiple debug symbol related objects
+  // for an address:
   //    lldb::SBSymbolContext SBAddress::GetSymbolContext (uint32_t
   //    resolve_scope);
   //    lldb::SBSymbolContext SBTarget::ResolveSymbolContextForAddress (const
@@ -80,8 +80,6 @@ public:
 
   lldb::SBLineEntry GetLineEntry();
 
-  lldb::AddressClass GetAddressClass();
-
 protected:
   friend class SBBlock;
   friend class SBBreakpointLocation;
@@ -103,7 +101,7 @@ protected:
 
   const lldb_private::Address *operator->() const;
 
-  friend bool operator==(const SBAddress &lhs, const SBAddress &rhs);
+  friend bool LLDB_API operator==(const SBAddress &lhs, const SBAddress &rhs);
 
   lldb_private::Address *get();
 
@@ -119,7 +117,7 @@ private:
   std::unique_ptr<lldb_private::Address> m_opaque_ap;
 };
 
-bool operator==(const SBAddress &lhs, const SBAddress &rhs);
+bool LLDB_API operator==(const SBAddress &lhs, const SBAddress &rhs);
 
 } // namespace lldb
 
diff --git a/include/lldb/API/SBBroadcaster.h b/include/lldb/API/SBBroadcaster.h
index 3fc47af655139..dc6c50ec0a8a5 100644
--- a/include/lldb/API/SBBroadcaster.h
+++ b/include/lldb/API/SBBroadcaster.h
@@ -46,17 +46,17 @@ public:
   bool RemoveListener(const lldb::SBListener &listener,
                       uint32_t event_mask = UINT32_MAX);
 
-  // This comparison is checking if the internal opaque pointer value
-  // is equal to that in "rhs".
+  // This comparison is checking if the internal opaque pointer value is equal
+  // to that in "rhs".
   bool operator==(const lldb::SBBroadcaster &rhs) const;
 
-  // This comparison is checking if the internal opaque pointer value
-  // is not equal to that in "rhs".
+  // This comparison is checking if the internal opaque pointer value is not
+  // equal to that in "rhs".
   bool operator!=(const lldb::SBBroadcaster &rhs) const;
 
-  // This comparison is checking if the internal opaque pointer value
-  // is less than that in "rhs" so SBBroadcaster objects can be contained
-  // in ordered containers.
+  // This comparison is checking if the internal opaque pointer value is less
+  // than that in "rhs" so SBBroadcaster objects can be contained in ordered
+  // containers.
   bool operator<(const lldb::SBBroadcaster &rhs) const;
 
 protected:
diff --git a/include/lldb/API/SBCommandInterpreter.h b/include/lldb/API/SBCommandInterpreter.h
index 80f24ceca7b41..8b9f065993666 100644
--- a/include/lldb/API/SBCommandInterpreter.h
+++ b/include/lldb/API/SBCommandInterpreter.h
@@ -138,23 +138,20 @@ public:
                               lldb::SBCommandReturnObject result);
 
   // The pointer based interface is not useful in SWIG, since the cursor &
-  // last_char arguments are string pointers INTO current_line
-  // and you can't do that in a scripting language interface in general...
+  // last_char arguments are string pointers INTO current_line and you can't do
+  // that in a scripting language interface in general...
 
   // In either case, the way this works is that the you give it a line and
-  // cursor position in the line.  The function
-  // will return the number of completions.  The matches list will contain
-  // number_of_completions + 1 elements.  The first
-  // element is the common substring after the cursor position for all the
-  // matches.  The rest of the elements are the
-  // matches.  The first element is useful if you are emulating the common shell
-  // behavior where the tab completes
-  // to the string that is common among all the matches, then you should first
-  // check if the first element is non-empty,
+  // cursor position in the line.  The function will return the number of
+  // completions.  The matches list will contain number_of_completions + 1
+  // elements.  The first element is the common substring after the cursor
+  // position for all the matches.  The rest of the elements are the matches.
+  // The first element is useful if you are emulating the common shell behavior
+  // where the tab completes to the string that is common among all the
+  // matches, then you should first check if the first element is non-empty,
   // and if so just insert it and move the cursor to the end of the insertion.
-  // The next tab will return an empty
-  // common substring, and a list of choices (if any), at which point you should
-  // display the choices and let the user
+  // The next tab will return an empty common substring, and a list of choices
+  // (if any), at which point you should display the choices and let the user
   // type further to disambiguate.
 
   int HandleCompletion(const char *current_line, const char *cursor,
@@ -167,9 +164,9 @@ public:
 
   bool WasInterrupted() const;
 
-  // Catch commands before they execute by registering a callback that will
-  // get called when the command gets executed. This allows GUI or command
-  // line interfaces to intercept a command and stop it from happening
+  // Catch commands before they execute by registering a callback that will get
+  // called when the command gets executed. This allows GUI or command line
+  // interfaces to intercept a command and stop it from happening
   bool SetCommandOverrideCallback(const char *command_name,
                                   lldb::CommandOverrideCallback callback,
                                   void *baton);
@@ -211,6 +208,25 @@ public:
   void SetPromptOnQuit(bool b);
 
   //----------------------------------------------------------------------
+  /// Sets whether the command interpreter should allow custom exit codes
+  /// for the 'quit' command.
+  //----------------------------------------------------------------------
+  void AllowExitCodeOnQuit(bool allow);
+
+  //----------------------------------------------------------------------
+  /// Returns true if the user has called the 'quit' command with a custom exit
+  /// code.
+  //----------------------------------------------------------------------
+  bool HasCustomQuitExitCode();
+
+  //----------------------------------------------------------------------
+  /// Returns the exit code that the user has specified when running the
+  /// 'quit' command. Returns 0 if the user hasn't called 'quit' at all or
+  /// without a custom exit code.
+  //----------------------------------------------------------------------
+  int GetQuitStatus();
+
+  //----------------------------------------------------------------------
   /// Resolve the command just as HandleCommand would, expanding abbreviations
   /// and aliases.  If successful, result->GetOutput has the full expansion.
   //----------------------------------------------------------------------
diff --git a/include/lldb/API/SBCommandReturnObject.h b/include/lldb/API/SBCommandReturnObject.h
index c73e3f7cf1f27..a372ea2ad9ee2 100644
--- a/include/lldb/API/SBCommandReturnObject.h
+++ b/include/lldb/API/SBCommandReturnObject.h
@@ -67,8 +67,7 @@ public:
 
   bool GetDescription(lldb::SBStream &description);
 
-  // deprecated, these two functions do not take
-  // ownership of file handle
+  // deprecated, these two functions do not take ownership of file handle
   void SetImmediateOutputFile(FILE *fh);
 
   void SetImmediateErrorFile(FILE *fh);
diff --git a/include/lldb/API/SBData.h b/include/lldb/API/SBData.h
index 7aa4ea0ff8d05..7ff619e68667b 100644
--- a/include/lldb/API/SBData.h
+++ b/include/lldb/API/SBData.h
@@ -71,11 +71,10 @@ public:
                       lldb::addr_t base_addr = LLDB_INVALID_ADDRESS);
 
   // it would be nice to have SetData(SBError, const void*, size_t) when
-  // endianness and address size can be
-  // inferred from the existing DataExtractor, but having two SetData()
-  // signatures triggers a SWIG bug where
-  // the typemap isn't applied before resolving the overload, and thus the right
-  // function never gets called
+  // endianness and address size can be inferred from the existing
+  // DataExtractor, but having two SetData() signatures triggers a SWIG bug
+  // where the typemap isn't applied before resolving the overload, and thus
+  // the right function never gets called
   void SetData(lldb::SBError &error, const void *buf, size_t size,
                lldb::ByteOrder endian, uint8_t addr_size);
 
@@ -87,9 +86,8 @@ public:
                                             const char *data);
 
   // in the following CreateData*() and SetData*() prototypes, the two
-  // parameters array and array_len
-  // should not be renamed or rearranged, because doing so will break the SWIG
-  // typemap
+  // parameters array and array_len should not be renamed or rearranged,
+  // because doing so will break the SWIG typemap
   static lldb::SBData CreateDataFromUInt64Array(lldb::ByteOrder endian,
                                                 uint32_t addr_byte_size,
                                                 uint64_t *array,
diff --git a/include/lldb/API/SBDebugger.h b/include/lldb/API/SBDebugger.h
index 8379a6911afc9..a416b460f3186 100644
--- a/include/lldb/API/SBDebugger.h
+++ b/include/lldb/API/SBDebugger.h
@@ -181,6 +181,8 @@ public:
 
   static const char *StateAsCString(lldb::StateType state);
 
+  static SBStructuredData GetBuildConfiguration();
+
   static bool StateIsRunningState(lldb::StateType state);
 
   static bool StateIsStoppedState(lldb::StateType state);
diff --git a/include/lldb/API/SBExpressionOptions.h b/include/lldb/API/SBExpressionOptions.h
index 370811d0c3557..1459ba6fee2aa 100644
--- a/include/lldb/API/SBExpressionOptions.h
+++ b/include/lldb/API/SBExpressionOptions.h
@@ -51,10 +51,8 @@ public:
   uint32_t GetOneThreadTimeoutInMicroSeconds() const;
 
   // Set the timeout for running on one thread, 0 means use the default
-  // behavior.
-  // If you set this higher than the overall timeout, you'll get an error when
-  // you
-  // try to run the expression.
+  // behavior. If you set this higher than the overall timeout, you'll get an
+  // error when you try to run the expression.
   void SetOneThreadTimeoutInMicroSeconds(uint32_t timeout = 0);
 
   bool GetTryAllThreads() const;
diff --git a/include/lldb/API/SBFrame.h b/include/lldb/API/SBFrame.h
index 58339750def65..b8953dd132368 100644
--- a/include/lldb/API/SBFrame.h
+++ b/include/lldb/API/SBFrame.h
@@ -153,10 +153,10 @@ public:
                              lldb::DynamicValueType use_dynamic);
 
   // Find a value for a variable expression path like "rect.origin.x" or
-  // "pt_ptr->x", "*self", "*this->obj_ptr". The returned value is _not_
-  // and expression result and is not a constant object like
-  // SBFrame::EvaluateExpression(...) returns, but a child object of
-  // the variable value.
+  // "pt_ptr->x", "*self", "*this->obj_ptr". The returned value is _not_ and
+  // expression result and is not a constant object like
+  // SBFrame::EvaluateExpression(...) returns, but a child object of the
+  // variable value.
   lldb::SBValue GetValueForVariablePath(const char *var_expr_cstr,
                                         DynamicValueType use_dynamic);
 
diff --git a/include/lldb/API/SBInstruction.h b/include/lldb/API/SBInstruction.h
index 23daf1c566377..5ef02b8f696ad 100644
--- a/include/lldb/API/SBInstruction.h
+++ b/include/lldb/API/SBInstruction.h
@@ -16,8 +16,7 @@
 #include <stdio.h>
 
 // There's a lot to be fixed here, but need to wait for underlying insn
-// implementation
-// to be revised & settle down first.
+// implementation to be revised & settle down first.
 
 class InstructionImpl;
 
@@ -37,8 +36,6 @@ public:
 
   SBAddress GetAddress();
 
-  lldb::AddressClass GetAddressClass();
-
   const char *GetMnemonic(lldb::SBTarget target);
 
   const char *GetOperands(lldb::SBTarget target);
diff --git a/include/lldb/API/SBInstructionList.h b/include/lldb/API/SBInstructionList.h
index 0323a3c80c05d..c8fed5c83192b 100644
--- a/include/lldb/API/SBInstructionList.h
+++ b/include/lldb/API/SBInstructionList.h
@@ -33,8 +33,8 @@ public:
   lldb::SBInstruction GetInstructionAtIndex(uint32_t idx);
 
   // ----------------------------------------------------------------------
-  // Returns the number of instructions between the start and end address.
-  // If canSetBreakpoint is true then the count will be the number of 
+  // Returns the number of instructions between the start and end address. If
+  // canSetBreakpoint is true then the count will be the number of
   // instructions on which a breakpoint can be set.
   // ----------------------------------------------------------------------
   size_t GetInstructionsCount(const SBAddress &start,
diff --git a/include/lldb/API/SBLaunchInfo.h b/include/lldb/API/SBLaunchInfo.h
index 1cece235127f2..80eea7e429212 100644
--- a/include/lldb/API/SBLaunchInfo.h
+++ b/include/lldb/API/SBLaunchInfo.h
@@ -12,6 +12,10 @@
 
 #include "lldb/API/SBDefines.h"
 
+namespace lldb_private {
+class SBLaunchInfoImpl;
+}
+
 namespace lldb {
 
 class SBPlatform;
@@ -141,11 +145,10 @@ protected:
   friend class SBPlatform;
   friend class SBTarget;
 
-  lldb_private::ProcessLaunchInfo &ref();
-
   const lldb_private::ProcessLaunchInfo &ref() const;
+  void set_ref(const lldb_private::ProcessLaunchInfo &info);
 
-  ProcessLaunchInfoSP m_opaque_sp;
+  std::shared_ptr<lldb_private::SBLaunchInfoImpl> m_opaque_sp;
 };
 
 } // namespace lldb
diff --git a/include/lldb/API/SBModule.h b/include/lldb/API/SBModule.h
index bcc3997a275b8..d73267f8af507 100644
--- a/include/lldb/API/SBModule.h
+++ b/include/lldb/API/SBModule.h
@@ -129,6 +129,21 @@ public:
 
   lldb::SBCompileUnit GetCompileUnitAtIndex(uint32_t);
 
+  //------------------------------------------------------------------
+  /// Find compile units related to *this module and passed source
+  /// file.
+  ///
+  /// @param[in] sb_file_spec
+  ///     A lldb::SBFileSpec object that contains source file
+  ///     specification.
+  ///
+  /// @return
+  ///     A lldb::SBSymbolContextList that gets filled in with all of
+  ///     the symbol contexts for all the matches.
+  //------------------------------------------------------------------
+  lldb::SBSymbolContextList
+  FindCompileUnits(const lldb::SBFileSpec &sb_file_spec);
+
   size_t GetNumSymbols();
 
   lldb::SBSymbol GetSymbolAtIndex(size_t idx);
diff --git a/include/lldb/API/SBProcess.h b/include/lldb/API/SBProcess.h
index 2e8925941fb74..4ad24f63f0762 100644
--- a/include/lldb/API/SBProcess.h
+++ b/include/lldb/API/SBProcess.h
@@ -98,10 +98,10 @@ public:
   lldb::SBThread GetSelectedThread() const;
 
   //------------------------------------------------------------------
-  // Function for lazily creating a thread using the current OS
-  // plug-in. This function will be removed in the future when there
-  // are APIs to create SBThread objects through the interface and add
-  // them to the process through the SBProcess API.
+  // Function for lazily creating a thread using the current OS plug-in. This
+  // function will be removed in the future when there are APIs to create
+  // SBThread objects through the interface and add them to the process through
+  // the SBProcess API.
   //------------------------------------------------------------------
   lldb::SBThread CreateOSPluginThread(lldb::tid_t tid, lldb::addr_t context);
 
@@ -313,6 +313,40 @@ public:
                      const lldb::SBFileSpec &remote_image_spec,
                      lldb::SBError &error);
 
+  //------------------------------------------------------------------
+  /// Load a shared library into this process, starting with a
+  /// library name and a list of paths, searching along the list of
+  /// paths till you find a matching library.
+  ///
+  /// @param[in] local_spec
+  ///     The name of the shared library that you want to load.  
+  ///     If local_spec is a relative path, the relative path will be
+  ///     appended to the search paths.
+  ///     If the local_spec is an absolute path, just the basename is used.
+  ///
+  /// @param[in] paths
+  ///     A list of paths to search for the library whose basename is 
+  ///     local_spec.
+  ///
+  /// @param[out] loaded_path
+  ///     If the library was found along the paths, this will store the
+  ///     full path to the found library.
+  ///
+  /// @param[out] error
+  ///     An error object that gets filled in with any errors that
+  ///     might occur when trying to search for the shared library.
+  ///
+  /// @return
+  ///     A token that represents the shared library that can be
+  ///     later passed to UnloadImage. A value of
+  ///     LLDB_INVALID_IMAGE_TOKEN will be returned if the shared
+  ///     library can't be opened.
+  //------------------------------------------------------------------
+  uint32_t LoadImageUsingPaths(const lldb::SBFileSpec &image_spec,
+                               SBStringList &paths,
+                               lldb::SBFileSpec &loaded_path, 
+                               lldb::SBError &error);
+
   lldb::SBError UnloadImage(uint32_t image_token);
 
   lldb::SBError SendEventData(const char *data);
diff --git a/include/lldb/API/SBStream.h b/include/lldb/API/SBStream.h
index a75afc7ee375a..7364ca7797f89 100644
--- a/include/lldb/API/SBStream.h
+++ b/include/lldb/API/SBStream.h
@@ -26,13 +26,12 @@ public:
 
   bool IsValid() const;
 
-  // If this stream is not redirected to a file, it will maintain a local
-  // cache for the stream data which can be accessed using this accessor.
+  // If this stream is not redirected to a file, it will maintain a local cache
+  // for the stream data which can be accessed using this accessor.
   const char *GetData();
 
-  // If this stream is not redirected to a file, it will maintain a local
-  // cache for the stream output whose length can be accessed using this
-  // accessor.
+  // If this stream is not redirected to a file, it will maintain a local cache
+  // for the stream output whose length can be accessed using this accessor.
   size_t GetSize();
 
   void Printf(const char *format, ...) __attribute__((format(printf, 2, 3)));
@@ -44,8 +43,8 @@ public:
   void RedirectToFileDescriptor(int fd, bool transfer_fh_ownership);
 
   // If the stream is redirected to a file, forget about the file and if
-  // ownership of the file was transferred to this object, close the file.
-  // If the stream is backed by a local cache, clear this cache.
+  // ownership of the file was transferred to this object, close the file. If
+  // the stream is backed by a local cache, clear this cache.
   void Clear();
 
 protected:
diff --git a/include/lldb/API/SBStructuredData.h b/include/lldb/API/SBStructuredData.h
index f3baaf7c48013..ca8229a574dfc 100644
--- a/include/lldb/API/SBStructuredData.h
+++ b/include/lldb/API/SBStructuredData.h
@@ -99,6 +99,7 @@ public:
 protected:
   friend class SBTraceOptions;
   friend class SBDebugger;
+  friend class SBTarget;
 
   StructuredDataImplUP m_impl_up;
 };
diff --git a/include/lldb/API/SBSymbol.h b/include/lldb/API/SBSymbol.h
index d17a4ccffe02e..a29ac61d2912b 100644
--- a/include/lldb/API/SBSymbol.h
+++ b/include/lldb/API/SBSymbol.h
@@ -55,8 +55,8 @@ public:
   bool GetDescription(lldb::SBStream &description);
 
   //----------------------------------------------------------------------
-  // Returns true if the symbol is externally visible in the module that
-  // it is defined in
+  // Returns true if the symbol is externally visible in the module that it is
+  // defined in
   //----------------------------------------------------------------------
   bool IsExternal();
 
diff --git a/include/lldb/API/SBTarget.h b/include/lldb/API/SBTarget.h
index 4085a16b43fbc..8d99545902fe2 100644
--- a/include/lldb/API/SBTarget.h
+++ b/include/lldb/API/SBTarget.h
@@ -75,6 +75,8 @@ public:
 
   lldb::SBProcess GetProcess();
 
+  lldb::SBStructuredData GetStatistics();
+
   //------------------------------------------------------------------
   /// Return the platform object associated with the target.
   ///
@@ -163,6 +165,7 @@ public:
                          bool stop_at_entry, lldb::SBError &error);
 
   SBProcess LoadCore(const char *core_file);
+  SBProcess LoadCore(const char *core_file, lldb::SBError &error);
 
   //------------------------------------------------------------------
   /// Launch a new process with sensible defaults.
@@ -289,6 +292,21 @@ public:
 
   lldb::SBModule FindModule(const lldb::SBFileSpec &file_spec);
 
+  //------------------------------------------------------------------
+  /// Find compile units related to *this target and passed source
+  /// file.
+  ///
+  /// @param[in] sb_file_spec
+  ///     A lldb::SBFileSpec object that contains source file
+  ///     specification.
+  ///
+  /// @return
+  ///     A lldb::SBSymbolContextList that gets filled in with all of
+  ///     the symbol contexts for all the matches.
+  //------------------------------------------------------------------
+  lldb::SBSymbolContextList
+  FindCompileUnits(const lldb::SBFileSpec &sb_file_spec);
+
   lldb::ByteOrder GetByteOrder();
 
   uint32_t GetAddressByteSize();
@@ -716,9 +734,9 @@ public:
   // Finds all breakpoints by name, returning the list in bkpt_list.  Returns
   // false if the name is not a valid breakpoint name, true otherwise.
   bool FindBreakpointsByName(const char *name, SBBreakpointList &bkpt_list);
-  
+
   void GetBreakpointNames(SBStringList &names);
-  
+
   void DeleteBreakpointName(const char *name);
 
   bool EnableAllBreakpoints();
@@ -773,8 +791,7 @@ public:
                                           const void *buf, size_t size);
 
   // The "WithFlavor" is necessary to keep SWIG from getting confused about
-  // overloaded arguments when
-  // using the buf + size -> Python Object magic.
+  // overloaded arguments when using the buf + size -> Python Object magic.
 
   lldb::SBInstructionList GetInstructionsWithFlavor(lldb::SBAddress base_addr,
                                                     const char *flavor_string,
@@ -827,8 +844,8 @@ protected:
   friend class SBValue;
 
   //------------------------------------------------------------------
-  // Constructors are private, use static Target::Create function to
-  // create an instance of this class.
+  // Constructors are private, use static Target::Create function to create an
+  // instance of this class.
   //------------------------------------------------------------------
 
   lldb::TargetSP GetSP() const;
diff --git a/include/lldb/API/SBThread.h b/include/lldb/API/SBThread.h
index 7f1cf10cc456b..afc05d2c61ade 100644
--- a/include/lldb/API/SBThread.h
+++ b/include/lldb/API/SBThread.h
@@ -93,6 +93,8 @@ public:
 
   void StepOver(lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
 
+  void StepOver(lldb::RunMode stop_other_threads, SBError &error);
+
   void StepInto(lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
 
   void StepInto(const char *target_name,
@@ -103,10 +105,16 @@ public:
 
   void StepOut();
 
-  void StepOutOfFrame(lldb::SBFrame &frame);
+  void StepOut(SBError &error);
+
+  void StepOutOfFrame(SBFrame &frame);
+
+  void StepOutOfFrame(SBFrame &frame, SBError &error);
 
   void StepInstruction(bool step_over);
 
+  void StepInstruction(bool step_over, SBError &error);
+
   SBError StepOverUntil(lldb::SBFrame &frame, lldb::SBFileSpec &file_spec,
                         uint32_t line);
 
@@ -119,6 +127,8 @@ public:
 
   void RunToAddress(lldb::addr_t addr);
 
+  void RunToAddress(lldb::addr_t addr, SBError &error);
+
   SBError ReturnFromFrame(SBFrame &frame, SBValue &return_value);
 
   SBError UnwindInnermostExpression();
@@ -146,8 +156,12 @@ public:
   //--------------------------------------------------------------------------
   bool Suspend();
 
+  bool Suspend(SBError &error);
+
   bool Resume();
 
+  bool Resume(SBError &error);
+
   bool IsSuspended();
 
   bool IsStopped();
diff --git a/include/lldb/API/SBValue.h b/include/lldb/API/SBValue.h
index 5ef8915b58f9a..ab5bdfea993dd 100644
--- a/include/lldb/API/SBValue.h
+++ b/include/lldb/API/SBValue.h
@@ -134,8 +134,7 @@ public:
                                        lldb::SBType type);
 
   // this has no address! GetAddress() and GetLoadAddress() as well as
-  // AddressOf()
-  // on the return of this call all return invalid
+  // AddressOf() on the return of this call all return invalid
   lldb::SBValue CreateValueFromData(const char *name, lldb::SBData data,
                                     lldb::SBType type);
 
diff --git a/include/lldb/API/SBValueList.h b/include/lldb/API/SBValueList.h
index 495b0140cad0d..0242dd7f71a27 100644
--- a/include/lldb/API/SBValueList.h
+++ b/include/lldb/API/SBValueList.h
@@ -43,8 +43,8 @@ public:
   const lldb::SBValueList &operator=(const lldb::SBValueList &rhs);
 
 protected:
-  // only useful for visualizing the pointer or comparing two SBValueLists
-  // to see if they are backed by the same underlying Impl.
+  // only useful for visualizing the pointer or comparing two SBValueLists to
+  // see if they are backed by the same underlying Impl.
   void *opaque_ptr();
 
 private:
diff --git a/include/lldb/API/SystemInitializerFull.h b/include/lldb/API/SystemInitializerFull.h
deleted file mode 100644
index 9cfc6896da61e..0000000000000
--- a/include/lldb/API/SystemInitializerFull.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===-- SystemInitializerFull.h ---------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_API_SYSTEM_INITIALIZER_FULL_H
-#define LLDB_API_SYSTEM_INITIALIZER_FULL_H
-
-#include "lldb/Initialization/SystemInitializerCommon.h"
-
-namespace lldb_private {
-//------------------------------------------------------------------
-/// Initializes lldb.
-///
-/// This class is responsible for initializing all of lldb system
-/// services needed to use the full LLDB application.  This class is
-/// not intended to be used externally, but is instead used
-/// internally by SBDebugger to initialize the system.
-//------------------------------------------------------------------
-class SystemInitializerFull : public SystemInitializerCommon {
-public:
-  SystemInitializerFull();
-  ~SystemInitializerFull() override;
-
-  void Initialize() override;
-  void Terminate() override;
-
-private:
-  void InitializeSWIG();
-};
-
-} // namespace lldb_private
-
-#endif // LLDB_API_SYSTEM_INITIALIZER_FULL_H