Revert "Create basic SBEnvironment class"

This reverts commit fd868f5.

Author: Walter Erquinigo

lldb/bindings/headers.swig

@@ -21,7 +21,6 @@
 #include "lldb/API/SBData.h"
 #include "lldb/API/SBDebugger.h"
 #include "lldb/API/SBDeclaration.h"
-#include "lldb/API/SBEnvironment.h"
 #include "lldb/API/SBError.h"
 #include "lldb/API/SBEvent.h"
 #include "lldb/API/SBExecutionContext.h"

lldb/bindings/interface/SBEnvironment.i

@@ -64,12 +64,6 @@ public:
     void
     SetEnvironmentEntries (const char **envp, bool append);
 
-    void
-    SetEnvironment(const SBEnvironment &env, bool append);
-
-    SBEnvironment
-    GetEnvironment();
-
     void
     Clear ();
 

lldb/bindings/interface/SBLaunchInfo.i

@@ -194,9 +194,6 @@ public:
     lldb::SBUnixSignals
     GetUnixSignals();
 
-    lldb::SBEnvironment
-    GetEnvironment();
-
 };
 
 } // namespace lldb

lldb/bindings/interface/SBPlatform.i

@@ -677,9 +677,6 @@ public:
     lldb::SBBreakpoint
     BreakpointCreateByAddress (addr_t address);
 
-    lldb::SBEnvironment
-    GetEnvironment();
-
     lldb::SBBreakpoint
     BreakpointCreateBySBAddress (SBAddress &sb_address);
 

lldb/bindings/interface/SBTarget.i

@@ -29,7 +29,6 @@
 %include "./interface/SBDebugger.i"
 %include "./interface/SBDeclaration.i"
 %include "./interface/SBError.i"
-%include "./interface/SBEnvironment.i"
 %include "./interface/SBEvent.i"
 %include "./interface/SBExecutionContext.i"
 %include "./interface/SBExpressionOptions.i"

lldb/bindings/interfaces.swig

@@ -24,7 +24,6 @@
 #include "lldb/API/SBDebugger.h"
 #include "lldb/API/SBDeclaration.h"
 #include "lldb/API/SBDefines.h"
-#include "lldb/API/SBEnvironment.h"
 #include "lldb/API/SBError.h"
 #include "lldb/API/SBEvent.h"
 #include "lldb/API/SBExecutionContext.h"

lldb/include/lldb/API/LLDB.h

@@ -35,7 +35,6 @@ class LLDB_API SBCompileUnit;
 class LLDB_API SBData;
 class LLDB_API SBDebugger;
 class LLDB_API SBDeclaration;
-class LLDB_API SBEnvironment;
 class LLDB_API SBError;
 class LLDB_API SBEvent;
 class LLDB_API SBEventList;

lldb/include/lldb/API/SBDefines.h

@@ -94,41 +94,8 @@ class LLDB_API SBLaunchInfo {
 
   const char *GetEnvironmentEntryAtIndex(uint32_t idx);
 
-  /// Update this object with the given environment variables.
-  ///
-  /// If append is false, the provided environment will replace the existing
-  /// environment. Otherwise, existing values will be updated of left untouched
-  /// accordingly.
-  ///
-  /// \param [in] envp
-  ///     The new environment variables as a list of strings with the following
-  ///     format
-  ///         name=value
-  ///
-  /// \param [in] append
-  ///     Flag that controls whether to replace the existing environment.
   void SetEnvironmentEntries(const char **envp, bool append);
 
-  /// Update this object with the given environment variables.
-  ///
-  /// If append is false, the provided environment will replace the existing
-  /// environment. Otherwise, existing values will be updated of left untouched
-  /// accordingly.
-  ///
-  /// \param [in] env
-  ///     The new environment variables.
-  ///
-  /// \param [in] append
-  ///     Flag that controls whether to replace the existing environment.
-  void SetEnvironment(const SBEnvironment &env, bool append);
-
-  /// Return the environment variables of this object.
-  ///
-  /// \return
-  ///     An lldb::SBEnvironment object which is a copy of the SBLaunchInfo's
-  ///     environment.
-  SBEnvironment GetEnvironment();
-
   void Clear();
 
   const char *GetWorkingDirectory() const;

lldb/include/lldb/API/SBEnvironment.h

@@ -154,14 +154,6 @@ class LLDB_API SBPlatform {
 
   SBUnixSignals GetUnixSignals() const;
 
-  /// Return the environment variables of the remote platform connection
-  /// process.
-  ///
-  /// \return
-  ///     An lldb::SBEnvironment object which is a copy of the platform's
-  ///     environment.
-  SBEnvironment GetEnvironment();
-
 protected:
   friend class SBDebugger;
   friend class SBTarget;

lldb/include/lldb/API/SBLaunchInfo.h

@@ -94,15 +94,6 @@ class LLDB_API SBTarget {
   ///     A platform object.
   lldb::SBPlatform GetPlatform();
 
-  /// Return the environment variables that would be used to launch a new
-  /// process.
-  ///
-  /// \return
-  ///     An lldb::SBEnvironment object which is a copy of the target's
-  ///     environment.
-
-  SBEnvironment GetEnvironment();
-
   /// Install any binaries that need to be installed.
   ///
   /// This function does nothing when debugging on the host system.

lldb/include/lldb/API/SBPlatform.h

@@ -50,7 +50,6 @@ class Environment : private llvm::StringMap<std::string> {
   using Base::erase;
   using Base::find;
   using Base::insert;
-  using Base::insert_or_assign;
   using Base::lookup;
   using Base::size;
   using Base::try_emplace;

lldb/include/lldb/API/SBTarget.h

@@ -76,7 +76,6 @@ class DynamicCheckerFunctions;
 class DynamicLoader;
 class Editline;
 class EmulateInstruction;
-class Environment;
 class EvaluateExpressionOptions;
 class Event;
 class EventData;

lldb/include/lldb/Utility/Environment.h

@@ -35,7 +35,6 @@ add_lldb_library(liblldb SHARED ${option_framework}
   SBData.cpp
   SBDebugger.cpp
   SBDeclaration.cpp
-  SBEnvironment.cpp
   SBError.cpp
   SBEvent.cpp
   SBExecutionContext.cpp