3 files changed, 18 insertions, 10 deletions
diff --git a/lldb/source/Target/CPPLanguageRuntime.cpp b/lldb/source/Target/CPPLanguageRuntime.cpp
index 889fc9fb947..6b36d14a114 100644
--- a/lldb/source/Target/CPPLanguageRuntime.cpp
+++ b/lldb/source/Target/CPPLanguageRuntime.cpp
@@ -23,11 +23,9 @@ public:
     {
         
         m_impl.Append(ConstString("std::basic_string<char, std::char_traits<char>, std::allocator<char> >").AsCString(), ConstString("basic_string<char>"));
-        m_impl.Append(ConstString("class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >").AsCString(), ConstString("basic_string<char>"));
 
         // these two (with a prefixed std::) occur when c++stdlib string class occurs as a template argument in some STL container
         m_impl.Append(ConstString("std::basic_string<char, std::char_traits<char>, std::allocator<char> >").AsCString(), ConstString("std::basic_string<char>"));
-        m_impl.Append(ConstString("class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >").AsCString(), ConstString("std::asic_string<char>"));
         
         m_impl.Sort();
     }
diff --git a/lldb/source/Target/ObjCLanguageRuntime.cpp b/lldb/source/Target/ObjCLanguageRuntime.cpp
index 6d6caefa64f..db51729ee99 100644
--- a/lldb/source/Target/ObjCLanguageRuntime.cpp
+++ b/lldb/source/Target/ObjCLanguageRuntime.cpp
@@ -130,17 +130,15 @@ ObjCLanguageRuntime::LookupInCompleteClassCache (ConstString &name)
         return TypeSP();
     
     const SymbolContext null_sc;
-    const ClangNamespaceDecl *null_namespace_decl = NULL;
-    const bool append = false;
+    const bool exact_match = true;
     const uint32_t max_matches = UINT32_MAX;
     TypeList types;
     
-    module_sp->FindTypes(null_sc, 
-                         name,
-                         null_namespace_decl,
-                         append, 
-                         max_matches, 
-                         types);
+    module_sp->FindTypes (null_sc,
+                          name,
+                          exact_match,
+                          max_matches,
+                          types);
     
     if (types.GetSize() == 1)
     {
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
index cc8070d437c..dcb8ba10c52 100644
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -567,7 +567,19 @@ Platform::LaunchProcess (ProcessLaunchInfo &launch_info)
     // Take care of the host case so that each subclass can just 
     // call this function to get the host functionality.
     if (IsHost())
+    {
+        if (::getenv ("LLDB_LAUNCH_FLAG_LAUNCH_IN_TTY"))
+            launch_info.GetFlags().Set (eLaunchFlagLaunchInTTY);
+        
+        if (launch_info.GetFlags().Test (eLaunchFlagLaunchInShell))
+        {
+            const bool is_localhost = true;
+            if (!launch_info.ConvertArgumentsForLaunchingInShell (error, is_localhost))
+                return error;
+        }
+
         error = Host::LaunchProcess (launch_info);
+    }
     else
         error.SetErrorString ("base lldb_private::Platform class can't launch remote processes");
     return error;