vendor/lldb/lldb-release_39-r276489

12 files changed, 639 insertions, 630 deletions

diff --git a/source/Plugins/Language/ObjC/CF.cpp b/source/Plugins/Language/ObjC/CF.cpp
index 614eb29a0f7a..617bb613aa0b 100644
--- a/source/Plugins/Language/ObjC/CF.cpp
+++ b/source/Plugins/Language/ObjC/CF.cpp
@@ -73,37 +73,28 @@ lldb_private::formatters::CFBagSummaryProvider (ValueObject& valobj, Stream& str
     if (descriptor->IsCFType())
     {
         ConstString type_name(valobj.GetTypeName());
-        if (type_name == ConstString("__CFBag") || type_name == ConstString("const struct __CFBag"))
+        
+        static ConstString g___CFBag("__CFBag");
+        static ConstString g_conststruct__CFBag("const struct __CFBag");
+        
+        if (type_name == g___CFBag ||
+            type_name == g_conststruct__CFBag)
         {
             if (valobj.IsPointerType())
                 is_type_ok = true;
         }
     }
     
-    if (is_type_ok == false)
-    {
-        StackFrameSP frame_sp(valobj.GetFrameSP());
-        if (!frame_sp)
-            return false;
-        ValueObjectSP count_sp;
-        StreamString expr;
-        expr.Printf("(int)CFBagGetCount((void*)0x%" PRIx64 ")",valobj.GetPointerValue());
-        EvaluateExpressionOptions options;
-        options.SetResultIsInternal(true);
-        if (process_sp->GetTarget().EvaluateExpression(expr.GetData(), frame_sp.get(), count_sp, options) != eExpressionCompleted)
-            return false;
-        if (!count_sp)
-            return false;
-        count = count_sp->GetValueAsUnsigned(0);
-    }
-    else
+    if (is_type_ok)
     {
-        uint32_t offset = 2*ptr_size+4 + valobj_addr;
+        lldb::addr_t offset = 2*ptr_size+4 + valobj_addr;
         Error error;
         count = process_sp->ReadUnsignedIntegerFromMemory(offset, 4, 0, error);
         if (error.Fail())
             return false;
     }
+    else
+        return false;
     
     std::string prefix,suffix;
     if (Language* language = Language::FindPlugin(options.GetLanguage()))
@@ -284,37 +275,30 @@ lldb_private::formatters::CFBinaryHeapSummaryProvider (ValueObject& valobj, Stre
     if (descriptor->IsCFType())
     {
         ConstString type_name(valobj.GetTypeName());
-        if (type_name == ConstString("__CFBinaryHeap") || type_name == ConstString("const struct __CFBinaryHeap"))
+        
+        static ConstString g___CFBinaryHeap("__CFBinaryHeap");
+        static ConstString g_conststruct__CFBinaryHeap("const struct __CFBinaryHeap");
+        static ConstString g_CFBinaryHeapRef("CFBinaryHeapRef");
+
+        if (type_name == g___CFBinaryHeap ||
+            type_name == g_conststruct__CFBinaryHeap ||
+            type_name == g_CFBinaryHeapRef)
         {
             if (valobj.IsPointerType())
                 is_type_ok = true;
         }
     }
     
-    if (is_type_ok == false)
+    if (is_type_ok)
     {
-        StackFrameSP frame_sp(valobj.GetFrameSP());
-        if (!frame_sp)
-            return false;
-        ValueObjectSP count_sp;
-        StreamString expr;
-        expr.Printf("(int)CFBinaryHeapGetCount((void*)0x%" PRIx64 ")",valobj.GetPointerValue());
-        EvaluateExpressionOptions options;
-        options.SetResultIsInternal(true);
-        if (process_sp->GetTarget().EvaluateExpression(expr.GetData(), frame_sp.get(), count_sp, options) != eExpressionCompleted)
-            return false;
-        if (!count_sp)
-            return false;
-        count = count_sp->GetValueAsUnsigned(0);
-    }
-    else
-    {
-        uint32_t offset = 2*ptr_size;
+        lldb::addr_t offset = 2*ptr_size + valobj_addr;
         Error error;
         count = process_sp->ReadUnsignedIntegerFromMemory(offset, 4, 0, error);
         if (error.Fail())
             return false;
     }
+    else
+        return false;
     
     std::string prefix,suffix;
     if (Language* language = Language::FindPlugin(options.GetLanguage()))
diff --git a/source/Plugins/Language/ObjC/Cocoa.cpp b/source/Plugins/Language/ObjC/Cocoa.cpp
index aa6e476b6131..017c46ee3bb3 100644
--- a/source/Plugins/Language/ObjC/Cocoa.cpp
+++ b/source/Plugins/Language/ObjC/Cocoa.cpp
@@ -50,7 +50,7 @@ lldb_private::formatters::NSBundleSummaryProvider (ValueObject& valobj, Stream&
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -71,16 +71,15 @@ lldb_private::formatters::NSBundleSummaryProvider (ValueObject& valobj, Stream&
         ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset, valobj.GetCompilerType().GetBasicTypeFromAST(lldb::eBasicTypeObjCID), true));
         
         StreamString summary_stream;
-        bool was_nsstring_ok = NSStringSummaryProvider(*text.get(), summary_stream, options);
+        bool was_nsstring_ok = NSStringSummaryProvider(*text, summary_stream, options);
         if (was_nsstring_ok && summary_stream.GetSize() > 0)
         {
             stream.Printf("%s",summary_stream.GetData());
             return true;
         }
     }
-    // this is either an unknown subclass or an NSBundle that comes from [NSBundle mainBundle]
-    // which is encoded differently and needs to be handled by running code
-    return ExtractSummaryFromObjCExpression(valobj, "NSString*", "bundlePath", stream, options.GetLanguage());
+    
+    return false;
 }
 
 bool
@@ -97,7 +96,7 @@ lldb_private::formatters::NSTimeZoneSummaryProvider (ValueObject& valobj, Stream
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -117,14 +116,15 @@ lldb_private::formatters::NSTimeZoneSummaryProvider (ValueObject& valobj, Stream
         uint64_t offset = ptr_size;
         ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset, valobj.GetCompilerType(), true));
         StreamString summary_stream;
-        bool was_nsstring_ok = NSStringSummaryProvider(*text.get(), summary_stream, options);
+        bool was_nsstring_ok = NSStringSummaryProvider(*text, summary_stream, options);
         if (was_nsstring_ok && summary_stream.GetSize() > 0)
         {
             stream.Printf("%s",summary_stream.GetData());
             return true;
         }
     }
-    return ExtractSummaryFromObjCExpression(valobj, "NSString*", "name", stream, options.GetLanguage());
+    
+    return false;
 }
 
 bool
@@ -141,7 +141,7 @@ lldb_private::formatters::NSNotificationSummaryProvider (ValueObject& valobj, St
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -161,16 +161,15 @@ lldb_private::formatters::NSNotificationSummaryProvider (ValueObject& valobj, St
         uint64_t offset = ptr_size;
         ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset, valobj.GetCompilerType(), true));
         StreamString summary_stream;
-        bool was_nsstring_ok = NSStringSummaryProvider(*text.get(), summary_stream, options);
+        bool was_nsstring_ok = NSStringSummaryProvider(*text, summary_stream, options);
         if (was_nsstring_ok && summary_stream.GetSize() > 0)
         {
             stream.Printf("%s",summary_stream.GetData());
             return true;
         }
     }
-    // this is either an unknown subclass or an NSBundle that comes from [NSBundle mainBundle]
-    // which is encoded differently and needs to be handled by running code
-    return ExtractSummaryFromObjCExpression(valobj, "NSString*", "name", stream, options.GetLanguage());
+    
+    return false;
 }
 
 bool
@@ -187,7 +186,7 @@ lldb_private::formatters::NSMachPortSummaryProvider (ValueObject& valobj, Stream
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -204,22 +203,19 @@ lldb_private::formatters::NSMachPortSummaryProvider (ValueObject& valobj, Stream
     
     uint64_t port_number = 0;
     
-    do
+    if (!strcmp(class_name,"NSMachPort"))
     {
-        if (!strcmp(class_name,"NSMachPort"))
+        uint64_t offset = (ptr_size == 4 ? 12 : 20);
+        Error error;
+        port_number = process_sp->ReadUnsignedIntegerFromMemory(offset+valobj_addr, 4, 0, error);
+        if (error.Success())
         {
-            uint64_t offset = (ptr_size == 4 ? 12 : 20);
-            Error error;
-            port_number = process_sp->ReadUnsignedIntegerFromMemory(offset+valobj_addr, 4, 0, error);
-            if (error.Success())
-                break;
+            stream.Printf("mach port: %u",(uint32_t)(port_number & 0x00000000FFFFFFFF));
+            return true;
         }
-        if (!ExtractValueFromObjCExpression(valobj, "int", "machPort", port_number))
-            return false;
-    } while (false);
+    }
     
-    stream.Printf("mach port: %u",(uint32_t)(port_number & 0x00000000FFFFFFFF));
-    return true;
+    return false;
 }
 
 bool
@@ -236,7 +232,7 @@ lldb_private::formatters::NSIndexSetSummaryProvider (ValueObject& valobj, Stream
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -289,10 +285,7 @@ lldb_private::formatters::NSIndexSetSummaryProvider (ValueObject& valobj, Stream
             }
         }
         else
-        {
-            if (!ExtractValueFromObjCExpression(valobj, "unsigned long long int", "count", count))
-                return false;
-        }
+            return false;
     }  while (false);
     stream.Printf("%" PRIu64 " index%s",
                   count,
@@ -458,7 +451,7 @@ lldb_private::formatters::NSNumberSummaryProvider (ValueObject& valobj, Stream&
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -531,6 +524,7 @@ lldb_private::formatters::NSNumberSummaryProvider (ValueObject& valobj, Stream&
                     break;
                 case 17: // 0B10001
                     data_location += 8;
+                    LLVM_FALLTHROUGH;
                 case 4: // 0B0100
                     value = process_sp->ReadUnsignedIntegerFromMemory(data_location, 8, 0, error);
                     if (error.Fail())
@@ -542,7 +536,8 @@ lldb_private::formatters::NSNumberSummaryProvider (ValueObject& valobj, Stream&
                     uint32_t flt_as_int = process_sp->ReadUnsignedIntegerFromMemory(data_location, 4, 0, error);
                     if (error.Fail())
                         return false;
-                    float flt_value = *((float*)&flt_as_int);
+                    float flt_value = 0.0f;
+                    memcpy(&flt_value, &flt_as_int, sizeof(flt_as_int));
                     NSNumber_FormatFloat(valobj, stream, flt_value, options.GetLanguage());
                     break;
                 }
@@ -551,7 +546,8 @@ lldb_private::formatters::NSNumberSummaryProvider (ValueObject& valobj, Stream&
                     uint64_t dbl_as_lng = process_sp->ReadUnsignedIntegerFromMemory(data_location, 8, 0, error);
                     if (error.Fail())
                         return false;
-                    double dbl_value = *((double*)&dbl_as_lng);
+                    double dbl_value = 0.0;
+                    memcpy(&dbl_value, &dbl_as_lng, sizeof(dbl_as_lng));
                     NSNumber_FormatDouble(valobj, stream, dbl_value, options.GetLanguage());
                     break;
                 }
@@ -561,10 +557,8 @@ lldb_private::formatters::NSNumberSummaryProvider (ValueObject& valobj, Stream&
             return true;
         }
     }
-    else
-    {
-        return ExtractSummaryFromObjCExpression(valobj, "NSString*", "stringValue", stream, options.GetLanguage());
-    }
+
+    return false;
 }
 
 bool
@@ -581,7 +575,7 @@ lldb_private::formatters::NSURLSummaryProvider (ValueObject& valobj, Stream& str
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -625,10 +619,7 @@ lldb_private::formatters::NSURLSummaryProvider (ValueObject& valobj, Stream& str
             return true;
         }
     }
-    else
-    {
-        return ExtractSummaryFromObjCExpression(valobj, "NSString*", "description", stream, options.GetLanguage());
-    }
+
     return false;
 }
 
@@ -646,7 +637,7 @@ lldb_private::formatters::NSDateSummaryProvider (ValueObject& valobj, Stream& st
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -659,44 +650,48 @@ lldb_private::formatters::NSDateSummaryProvider (ValueObject& valobj, Stream& st
     uint64_t date_value_bits = 0;
     double date_value = 0.0;
     
-    const char* class_name = descriptor->GetClassName().GetCString();
+    ConstString class_name = descriptor->GetClassName();
     
-    if (!class_name || !*class_name)
+    static const ConstString g_NSDate("NSDate");
+    static const ConstString g___NSDate("__NSDate");
+    static const ConstString g___NSTaggedDate("__NSTaggedDate");
+    static const ConstString g_NSCalendarDate("NSCalendarDate");
+
+    if (class_name.IsEmpty())
         return false;
     
-    if (strcmp(class_name,"NSDate") == 0 ||
-        strcmp(class_name,"__NSDate") == 0 ||
-        strcmp(class_name,"__NSTaggedDate") == 0)
+    if ((class_name == g_NSDate) ||
+        (class_name == g___NSDate) ||
+        (class_name == g___NSTaggedDate))
     {
         uint64_t info_bits=0,value_bits = 0;
         if (descriptor->GetTaggedPointerInfo(&info_bits,&value_bits))
         {
             date_value_bits = ((value_bits << 8) | (info_bits << 4));
-            date_value = *((double*)&date_value_bits);
+            memcpy(&date_value, &date_value_bits, sizeof(date_value_bits));
         }
         else
         {
+            llvm::Triple triple(process_sp->GetTarget().GetArchitecture().GetTriple());
+            uint32_t delta = (triple.isWatchOS() && triple.isWatchABI()) ? 8 : ptr_size;
             Error error;
-            date_value_bits = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr+ptr_size, 8, 0, error);
-            date_value = *((double*)&date_value_bits);
+            date_value_bits = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr+delta, 8, 0, error);
+            memcpy(&date_value, &date_value_bits, sizeof(date_value_bits));
             if (error.Fail())
                 return false;
         }
     }
-    else if (!strcmp(class_name,"NSCalendarDate"))
+    else if (class_name == g_NSCalendarDate)
     {
         Error error;
         date_value_bits = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr+2*ptr_size, 8, 0, error);
-        date_value = *((double*)&date_value_bits);
+        memcpy(&date_value, &date_value_bits, sizeof(date_value_bits));
         if (error.Fail())
             return false;
     }
     else
-    {
-        if (ExtractValueFromObjCExpression(valobj, "NSTimeInterval", "ExtractValueFromObjCExpression", date_value_bits) == false)
-            return false;
-        date_value = *((double*)&date_value_bits);
-    }
+        return false;
+
     if (date_value == -63114076800)
     {
         stream.Printf("0001-12-30 00:00:00 +0000");
@@ -731,7 +726,7 @@ lldb_private::formatters::ObjCClassSummaryProvider (ValueObject& valobj, Stream&
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptorFromISA(valobj.GetValueAsUnsigned(0)));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     ConstString class_name = descriptor->GetClassName();
@@ -750,7 +745,7 @@ class ObjCClassSyntheticChildrenFrontEnd : public SyntheticChildrenFrontEnd
 {
 public:
     ObjCClassSyntheticChildrenFrontEnd (lldb::ValueObjectSP valobj_sp) :
-    SyntheticChildrenFrontEnd(*valobj_sp.get())
+        SyntheticChildrenFrontEnd(*valobj_sp)
     {
     }
     
@@ -808,7 +803,7 @@ lldb_private::formatters::NSDataSummaryProvider (ValueObject& valobj, Stream& st
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     bool is_64bit = (process_sp->GetAddressByteSize() == 8);
@@ -834,11 +829,20 @@ lldb_private::formatters::NSDataSummaryProvider (ValueObject& valobj, Stream& st
         if (error.Fail())
             return false;
     }
-    else
+    else if (!strcmp(class_name, "_NSInlineData"))
     {
-        if (!ExtractValueFromObjCExpression(valobj, "int", "length", value))
+        uint32_t offset = (is_64bit ? 8 : 4);
+        Error error;
+        value = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr + offset, 2, 0, error);
+        if (error.Fail())
             return false;
     }
+    else if (!strcmp(class_name, "_NSZeroData"))
+    {
+        value = 0;
+    }
+    else
+        return false;
     
     stream.Printf("%s%" PRIu64 " byte%s%s",
                   (needs_at ? "@\"" : ""),
@@ -869,13 +873,19 @@ lldb_private::formatters::ObjCBOOLSummaryProvider (ValueObject& valobj, Stream&
         if (!real_guy_sp)
             return false;
     }
-    uint64_t value = real_guy_sp->GetValueAsUnsigned(0);
-    if (value == 0)
+    uint8_t value = (real_guy_sp->GetValueAsUnsigned(0) & 0xFF);
+    switch (value)
     {
-        stream.Printf("NO");
-        return true;
+        case 0:
+            stream.Printf("NO");
+            break;
+        case 1:
+            stream.Printf("YES");
+            break;
+        default:
+            stream.Printf("%u",value);
+            break;
     }
-    stream.Printf("YES");
     return true;
 }
 
@@ -932,28 +942,16 @@ lldb_private::formatters::GetOSXEpoch ()
         tm_epoch.tm_min = 0;
         tm_epoch.tm_mon = 0;
         tm_epoch.tm_mday = 1;
-        tm_epoch.tm_year = 2001-1900; // for some reason, we need to subtract 1900 from this field. not sure why.
+        tm_epoch.tm_year = 2001-1900;
         tm_epoch.tm_isdst = -1;
         tm_epoch.tm_gmtoff = 0;
-        tm_epoch.tm_zone = NULL;
+        tm_epoch.tm_zone = nullptr;
         epoch = timegm(&tm_epoch);
 #endif
     }
     return epoch;
 }
 
-bool
-lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider (ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options)
-{
-    if (const char* description = valobj.GetObjectDescription())
-    {
-        stream.Printf("%s", description);
-        return true;
-    }
-    else
-        return false;
-}
-
 template bool
 lldb_private::formatters::NSDataSummaryProvider<true> (ValueObject&, Stream&, const TypeSummaryOptions&);
 
diff --git a/source/Plugins/Language/ObjC/Cocoa.h b/source/Plugins/Language/ObjC/Cocoa.h
index 0caacf3453d4..f43b1639cb38 100644
--- a/source/Plugins/Language/ObjC/Cocoa.h
+++ b/source/Plugins/Language/ObjC/Cocoa.h
@@ -13,6 +13,7 @@
 #include "lldb/Core/Stream.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/DataFormatters/TypeSummary.h"
+#include "lldb/DataFormatters/TypeSynthetic.h"
 #include "lldb/Target/ObjCLanguageRuntime.h"
 
 namespace lldb_private {
@@ -78,9 +79,6 @@ namespace lldb_private {
         ObjCSELSummaryProvider<false> (ValueObject&, Stream&, const TypeSummaryOptions&);
         
         bool
-        RuntimeSpecificDescriptionSummaryProvider (ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options);
-        
-        bool
         NSError_SummaryProvider (ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options);
         
         bool
@@ -91,6 +89,16 @@ namespace lldb_private {
         
         SyntheticChildrenFrontEnd*
         NSExceptionSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp);
+        
+        class NSArray_Additionals
+        {
+        public:
+            static std::map<ConstString, CXXFunctionSummaryFormat::Callback>&
+            GetAdditionalSummaries ();
+            
+            static std::map<ConstString, CXXSyntheticChildren::CreateFrontEndCallback>&
+            GetAdditionalSynthetics ();
+        };
     } // namespace formatters
 } // namespace lldb_private
 
diff --git a/source/Plugins/Language/ObjC/Makefile b/source/Plugins/Language/ObjC/Makefile
deleted file mode 100644
index 58c9e58f2bc6..000000000000
--- a/source/Plugins/Language/ObjC/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-##===- source/Plugins/Language/ObjC ------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginObjCLanguage
-BUILD_ARCHIVE = 1
-
-include $(LLDB_LEVEL)/Makefile
diff --git a/source/Plugins/Language/ObjC/NSArray.cpp b/source/Plugins/Language/ObjC/NSArray.cpp
index ccc82ab95ecc..5de97b6f0257 100644
--- a/source/Plugins/Language/ObjC/NSArray.cpp
+++ b/source/Plugins/Language/ObjC/NSArray.cpp
@@ -35,6 +35,20 @@ using namespace lldb_private::formatters;
 
 namespace  lldb_private {
     namespace formatters {
+        std::map<ConstString, CXXFunctionSummaryFormat::Callback>&
+        NSArray_Additionals::GetAdditionalSummaries ()
+        {
+            static std::map<ConstString, CXXFunctionSummaryFormat::Callback> g_map;
+            return g_map;
+        }
+        
+        std::map<ConstString, CXXSyntheticChildren::CreateFrontEndCallback>&
+        NSArray_Additionals::GetAdditionalSynthetics ()
+        {
+            static std::map<ConstString, CXXSyntheticChildren::CreateFrontEndCallback> g_map;
+            return g_map;
+        }
+        
         class NSArrayMSyntheticFrontEnd : public SyntheticChildrenFrontEnd
         {
         public:
@@ -73,7 +87,6 @@ namespace  lldb_private {
             ExecutionContextRef m_exe_ctx_ref;
             uint8_t m_ptr_size;
             CompilerType m_id_type;
-            std::vector<lldb::ValueObjectSP> m_children;
         };
         
         class NSArrayMSyntheticFrontEnd_109 : public NSArrayMSyntheticFrontEnd
@@ -103,7 +116,7 @@ namespace  lldb_private {
             struct DataDescriptor_32
             {
                 uint32_t _used;
-                uint32_t _priv1 : 2 ;
+                uint32_t _priv1 : 2;
                 uint32_t _size : 30;
                 uint32_t _priv2 : 2;
                 uint32_t _offset : 30;
@@ -114,7 +127,7 @@ namespace  lldb_private {
             struct DataDescriptor_64
             {
                 uint64_t _used;
-                uint64_t _priv1 : 2 ;
+                uint64_t _priv1 : 2;
                 uint64_t _size : 62;
                 uint64_t _priv2 : 2;
                 uint64_t _offset : 62;
@@ -202,7 +215,6 @@ namespace  lldb_private {
             uint64_t m_items;
             lldb::addr_t m_data_ptr;
             CompilerType m_id_type;
-            std::vector<lldb::ValueObjectSP> m_children;
         };
         
         class NSArray0SyntheticFrontEnd : public SyntheticChildrenFrontEnd
@@ -227,14 +239,14 @@ namespace  lldb_private {
             size_t
             GetIndexOfChildWithName(const ConstString &name) override;
         };
-        
-        class NSArrayCodeRunningSyntheticFrontEnd : public SyntheticChildrenFrontEnd
+
+        class NSArray1SyntheticFrontEnd : public SyntheticChildrenFrontEnd
         {
         public:
-            NSArrayCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
-
-            ~NSArrayCodeRunningSyntheticFrontEnd() override = default;
-
+            NSArray1SyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+            
+            ~NSArray1SyntheticFrontEnd() override = default;
+            
             size_t
             CalculateNumChildren() override;
             
@@ -269,7 +281,7 @@ lldb_private::formatters::NSArraySummaryProvider (ValueObject& valobj, Stream& s
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -281,30 +293,40 @@ lldb_private::formatters::NSArraySummaryProvider (ValueObject& valobj, Stream& s
     
     uint64_t value = 0;
     
-    const char* class_name = descriptor->GetClassName().GetCString();
+    ConstString class_name(descriptor->GetClassName());
     
-    if (!class_name || !*class_name)
+    static const ConstString g_NSArrayI("__NSArrayI");
+    static const ConstString g_NSArrayM("__NSArrayM");
+    static const ConstString g_NSArray0("__NSArray0");
+    static const ConstString g_NSArray1("__NSSingleObjectArrayI");
+    static const ConstString g_NSArrayCF("__NSCFArray");
+    
+    if (class_name.IsEmpty())
         return false;
     
-    if (!strcmp(class_name,"__NSArrayI"))
+    if (class_name == g_NSArrayI)
     {
         Error error;
         value = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr + ptr_size, ptr_size, 0, error);
         if (error.Fail())
             return false;
     }
-    else if (!strcmp(class_name,"__NSArrayM"))
+    else if (class_name == g_NSArrayM)
     {
         Error error;
         value = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr + ptr_size, ptr_size, 0, error);
         if (error.Fail())
             return false;
     }
-    else if (!strcmp(class_name,"__NSArray0"))
+    else if (class_name == g_NSArray0)
     {
         value = 0;
     }
-    else if (!strcmp(class_name,"__NSCFArray"))
+    else if (class_name == g_NSArray1)
+    {
+        value = 1;
+    }
+    else if (class_name == g_NSArrayCF)
     {
         Error error;
         value = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr + 2 * ptr_size, ptr_size, 0, error);
@@ -313,7 +335,11 @@ lldb_private::formatters::NSArraySummaryProvider (ValueObject& valobj, Stream& s
     }
     else
     {
-        if (!ExtractValueFromObjCExpression(valobj, "int", "count", value))
+        auto& map(NSArray_Additionals::GetAdditionalSummaries());
+        auto iter = map.find(class_name), end = map.end();
+        if (iter != end)
+            return iter->second(valobj, stream, options);
+        else
             return false;
     }
     
@@ -340,8 +366,7 @@ lldb_private::formatters::NSArrayMSyntheticFrontEnd::NSArrayMSyntheticFrontEnd (
 SyntheticChildrenFrontEnd(*valobj_sp),
 m_exe_ctx_ref(),
 m_ptr_size(8),
-m_id_type(),
-m_children()
+m_id_type()
 {
     if (valobj_sp)
     {
@@ -354,16 +379,16 @@ m_children()
 }
 
 lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::NSArrayMSyntheticFrontEnd_109 (lldb::ValueObjectSP valobj_sp) :
-NSArrayMSyntheticFrontEnd(valobj_sp),
-m_data_32(NULL),
-m_data_64(NULL)
+    NSArrayMSyntheticFrontEnd(valobj_sp),
+    m_data_32(nullptr),
+    m_data_64(nullptr)
 {
 }
 
 lldb_private::formatters::NSArrayMSyntheticFrontEnd_1010::NSArrayMSyntheticFrontEnd_1010 (lldb::ValueObjectSP valobj_sp) :
-NSArrayMSyntheticFrontEnd(valobj_sp),
-m_data_32(NULL),
-m_data_64(NULL)
+    NSArrayMSyntheticFrontEnd(valobj_sp),
+    m_data_32(nullptr),
+    m_data_64(nullptr)
 {
 }
 
@@ -386,24 +411,21 @@ lldb_private::formatters::NSArrayMSyntheticFrontEnd::GetChildAtIndex (size_t idx
     object_at_idx += (pyhs_idx * m_ptr_size);
     StreamString idx_name;
     idx_name.Printf("[%" PRIu64 "]", (uint64_t)idx);
-    lldb::ValueObjectSP retval_sp = CreateValueObjectFromAddress(idx_name.GetData(),
-                                                                 object_at_idx,
-                                                                 m_exe_ctx_ref,
-                                                                 m_id_type);
-    m_children.push_back(retval_sp);
-    return retval_sp;
+    return CreateValueObjectFromAddress(idx_name.GetData(),
+                                        object_at_idx,
+                                        m_exe_ctx_ref,
+                                        m_id_type);
 }
 
 bool
 lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::Update()
 {
-    m_children.clear();
     ValueObjectSP valobj_sp = m_backend.GetSP();
     m_ptr_size = 0;
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
     if (!valobj_sp)
         return false;
     m_exe_ctx_ref = valobj_sp->GetExecutionContextRef();
@@ -432,13 +454,12 @@ lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::Update()
 bool
 lldb_private::formatters::NSArrayMSyntheticFrontEnd_1010::Update()
 {
-    m_children.clear();
     ValueObjectSP valobj_sp = m_backend.GetSP();
     m_ptr_size = 0;
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
     if (!valobj_sp)
         return false;
     m_exe_ctx_ref = valobj_sp->GetExecutionContextRef();
@@ -483,9 +504,9 @@ lldb_private::formatters::NSArrayMSyntheticFrontEnd::GetIndexOfChildWithName (co
 lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::~NSArrayMSyntheticFrontEnd_109()
 {
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
 }
 
 lldb::addr_t
@@ -527,9 +548,9 @@ lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::GetSize ()
 lldb_private::formatters::NSArrayMSyntheticFrontEnd_1010::~NSArrayMSyntheticFrontEnd_1010()
 {
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
 }
 
 lldb::addr_t
@@ -569,11 +590,11 @@ lldb_private::formatters::NSArrayMSyntheticFrontEnd_1010::GetSize ()
 }
 
 lldb_private::formatters::NSArrayISyntheticFrontEnd::NSArrayISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd (*valobj_sp.get()),
-m_exe_ctx_ref (),
-m_ptr_size (8),
-m_items (0),
-m_data_ptr (0)
+    SyntheticChildrenFrontEnd(*valobj_sp),
+    m_exe_ctx_ref(),
+    m_ptr_size(8),
+    m_items(0),
+    m_data_ptr(0)
 {
     if (valobj_sp)
     {
@@ -609,7 +630,6 @@ lldb_private::formatters::NSArrayISyntheticFrontEnd::Update()
     m_ptr_size = 0;
     m_items = 0;
     m_data_ptr = 0;
-    m_children.clear();
     ValueObjectSP valobj_sp = m_backend.GetSP();
     if (!valobj_sp)
         return false;
@@ -649,16 +669,14 @@ lldb_private::formatters::NSArrayISyntheticFrontEnd::GetChildAtIndex (size_t idx
         return lldb::ValueObjectSP();
     StreamString idx_name;
     idx_name.Printf("[%" PRIu64 "]", (uint64_t)idx);
-    lldb::ValueObjectSP retval_sp = CreateValueObjectFromAddress(idx_name.GetData(),
-                                                                 object_at_idx,
-                                                                 m_exe_ctx_ref,
-                                                                 m_id_type);
-    m_children.push_back(retval_sp);
-    return retval_sp;
+    return CreateValueObjectFromAddress(idx_name.GetData(),
+                                        object_at_idx,
+                                        m_exe_ctx_ref,
+                                        m_id_type);
 }
 
 lldb_private::formatters::NSArray0SyntheticFrontEnd::NSArray0SyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd (*valobj_sp.get())
+    SyntheticChildrenFrontEnd(*valobj_sp)
 {
 }
 
@@ -692,17 +710,64 @@ lldb_private::formatters::NSArray0SyntheticFrontEnd::GetChildAtIndex (size_t idx
     return lldb::ValueObjectSP();
 }
 
-SyntheticChildrenFrontEnd* lldb_private::formatters::NSArraySyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
+lldb_private::formatters::NSArray1SyntheticFrontEnd::NSArray1SyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
+SyntheticChildrenFrontEnd (*valobj_sp.get())
+{
+}
+
+size_t
+lldb_private::formatters::NSArray1SyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
+{
+    static const ConstString g_zero("[0]");
+    
+    if (name == g_zero)
+        return 0;
+    
+    return UINT32_MAX;
+}
+
+size_t
+lldb_private::formatters::NSArray1SyntheticFrontEnd::CalculateNumChildren ()
+{
+    return 1;
+}
+
+bool
+lldb_private::formatters::NSArray1SyntheticFrontEnd::Update()
+{
+    return false;
+}
+
+bool
+lldb_private::formatters::NSArray1SyntheticFrontEnd::MightHaveChildren ()
+{
+    return true;
+}
+
+lldb::ValueObjectSP
+lldb_private::formatters::NSArray1SyntheticFrontEnd::GetChildAtIndex (size_t idx)
+{
+    static const ConstString g_zero("[0]");
+    
+    if (idx == 0)
+    {
+        CompilerType id_type(m_backend.GetTargetSP()->GetScratchClangASTContext()->GetBasicType(lldb::eBasicTypeObjCID));
+        return m_backend.GetSyntheticChildAtOffset(m_backend.GetProcessSP()->GetAddressByteSize(), id_type, true, g_zero);
+    }
+    return lldb::ValueObjectSP();
+}
+
+SyntheticChildrenFrontEnd* lldb_private::formatters::NSArraySyntheticFrontEndCreator (CXXSyntheticChildren* synth, lldb::ValueObjectSP valobj_sp)
 {
     if (!valobj_sp)
         return nullptr;
     
     lldb::ProcessSP process_sp (valobj_sp->GetProcessSP());
     if (!process_sp)
-        return NULL;
+        return nullptr;
     AppleObjCRuntime *runtime = llvm::dyn_cast_or_null<AppleObjCRuntime>(process_sp->GetObjCLanguageRuntime());
     if (!runtime)
-        return NULL;
+        return nullptr;
     
     CompilerType valobj_type(valobj_sp->GetCompilerType());
     Flags flags(valobj_type.GetTypeInfo());
@@ -712,28 +777,37 @@ SyntheticChildrenFrontEnd* lldb_private::formatters::NSArraySyntheticFrontEndCre
         Error error;
         valobj_sp = valobj_sp->AddressOf(error);
         if (error.Fail() || !valobj_sp)
-            return NULL;
+            return nullptr;
     }
     
-    ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(*valobj_sp.get()));
+    ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(*valobj_sp));
     
-    if (!descriptor.get() || !descriptor->IsValid())
-        return NULL;
+    if (!descriptor || !descriptor->IsValid())
+        return nullptr;
     
-    const char* class_name = descriptor->GetClassName().GetCString();
+    ConstString class_name(descriptor->GetClassName());
     
-    if (!class_name || !*class_name)
-        return NULL;
+    static const ConstString g_NSArrayI("__NSArrayI");
+    static const ConstString g_NSArrayM("__NSArrayM");
+    static const ConstString g_NSArray0("__NSArray0");
+    static const ConstString g_NSArray1("__NSSingleObjectArrayI");
+    
+    if (class_name.IsEmpty())
+        return nullptr;
     
-    if (!strcmp(class_name,"__NSArrayI"))
+    if (class_name == g_NSArrayI)
     {
         return (new NSArrayISyntheticFrontEnd(valobj_sp));
     }
-    else if (!strcmp(class_name,"__NSArray0"))
+    else if (class_name == g_NSArray0)
     {
         return (new NSArray0SyntheticFrontEnd(valobj_sp));
     }
-    else if (!strcmp(class_name,"__NSArrayM"))
+    else if (class_name == g_NSArray1)
+    {
+        return (new NSArray1SyntheticFrontEnd(valobj_sp));
+    }
+    else if (class_name == g_NSArrayM)
     {
         if (runtime->GetFoundationVersion() >= 1100)
             return (new NSArrayMSyntheticFrontEnd_1010(valobj_sp));
@@ -742,51 +816,11 @@ SyntheticChildrenFrontEnd* lldb_private::formatters::NSArraySyntheticFrontEndCre
     }
     else
     {
-        return (new NSArrayCodeRunningSyntheticFrontEnd(valobj_sp));
-    }
-}
-
-lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::NSArrayCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd(*valobj_sp.get())
-{}
-
-size_t
-lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::CalculateNumChildren ()
-{
-    uint64_t count = 0;
-    if (ExtractValueFromObjCExpression(m_backend, "int", "count", count))
-        return count;
-    return 0;
-}
-
-lldb::ValueObjectSP
-lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::GetChildAtIndex (size_t idx)
-{
-    StreamString idx_name;
-    idx_name.Printf("[%" PRIu64 "]", (uint64_t)idx);
-    lldb::ValueObjectSP valobj_sp = CallSelectorOnObject(m_backend,"id","objectAtIndex:",idx);
-    if (valobj_sp)
-    {
-        valobj_sp->SetPreferredDisplayLanguage(m_backend.GetPreferredDisplayLanguage());
-        valobj_sp->SetName(ConstString(idx_name.GetData()));
+        auto& map(NSArray_Additionals::GetAdditionalSynthetics());
+        auto iter = map.find(class_name), end = map.end();
+        if (iter != end)
+            return iter->second(synth, valobj_sp);
     }
-    return valobj_sp;
-}
-
-bool
-lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::Update()
-{
-    return false;
-}
-
-bool
-lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::MightHaveChildren ()
-{
-    return true;
-}
-
-size_t
-lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
-{
-    return 0;
+    
+    return nullptr;
 }
diff --git a/source/Plugins/Language/ObjC/NSDictionary.cpp b/source/Plugins/Language/ObjC/NSDictionary.cpp
index e4a7425329f5..cdebd6b3c23c 100644
--- a/source/Plugins/Language/ObjC/NSDictionary.cpp
+++ b/source/Plugins/Language/ObjC/NSDictionary.cpp
@@ -63,7 +63,7 @@ GetLLDBNSPairType (TargetSP target_sp)
         
         if (!compiler_type)
         {
-            compiler_type = target_ast_context->CreateRecordType(NULL, lldb::eAccessPublic, g___lldb_autogen_nspair.GetCString(), clang::TTK_Struct, lldb::eLanguageTypeC);
+            compiler_type = target_ast_context->CreateRecordType(nullptr, lldb::eAccessPublic, g___lldb_autogen_nspair.GetCString(), clang::TTK_Struct, lldb::eLanguageTypeC);
             
             if (compiler_type)
             {
@@ -131,6 +131,32 @@ namespace lldb_private {
             CompilerType m_pair_type;
             std::vector<DictionaryItemDescriptor> m_children;
         };
+
+        class NSDictionary1SyntheticFrontEnd : public SyntheticChildrenFrontEnd
+        {
+        public:
+            NSDictionary1SyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+            
+            ~NSDictionary1SyntheticFrontEnd() override = default;
+            
+            size_t
+            CalculateNumChildren() override;
+            
+            lldb::ValueObjectSP
+            GetChildAtIndex(size_t idx) override;
+            
+            bool
+            Update() override;
+            
+            bool
+            MightHaveChildren() override;
+            
+            size_t
+            GetIndexOfChildWithName(const ConstString &name) override;
+            
+        private:
+            ValueObjectSP m_pair;
+        };
         
         class NSDictionaryMSyntheticFrontEnd : public SyntheticChildrenFrontEnd
         {
@@ -190,29 +216,6 @@ namespace lldb_private {
             CompilerType m_pair_type;
             std::vector<DictionaryItemDescriptor> m_children;
         };
-        
-        class NSDictionaryCodeRunningSyntheticFrontEnd : public SyntheticChildrenFrontEnd
-        {
-        public:
-            NSDictionaryCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
-
-            ~NSDictionaryCodeRunningSyntheticFrontEnd() override = default;
-
-            size_t
-            CalculateNumChildren() override;
-            
-            lldb::ValueObjectSP
-            GetChildAtIndex(size_t idx) override;
-            
-            bool
-            Update() override;
-            
-            bool
-            MightHaveChildren() override;
-            
-            size_t
-            GetIndexOfChildWithName(const ConstString &name) override;
-        };
     } // namespace formatters
 } // namespace lldb_private
 
@@ -232,7 +235,7 @@ lldb_private::formatters::NSDictionarySummaryProvider (ValueObject& valobj, Stre
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -245,13 +248,16 @@ lldb_private::formatters::NSDictionarySummaryProvider (ValueObject& valobj, Stre
     
     uint64_t value = 0;
     
-    ConstString class_name_cs = descriptor->GetClassName();
-    const char* class_name = class_name_cs.GetCString();
+    ConstString class_name(descriptor->GetClassName());
+
+    static const ConstString g_DictionaryI("__NSDictionaryI");
+    static const ConstString g_DictionaryM("__NSDictionaryM");
+    static const ConstString g_Dictionary1("__NSSingleEntryDictionaryI");
     
-    if (!class_name || !*class_name)
+    if (class_name.IsEmpty())
         return false;
-    
-    if (!strcmp(class_name,"__NSDictionaryI"))
+
+    if (class_name == g_DictionaryI)
     {
         Error error;
         value = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr + ptr_size, ptr_size, 0, error);
@@ -259,7 +265,7 @@ lldb_private::formatters::NSDictionarySummaryProvider (ValueObject& valobj, Stre
             return false;
         value &= (is_64bit ? ~0xFC00000000000000UL : ~0xFC000000U);
     }
-    else if (!strcmp(class_name,"__NSDictionaryM"))
+    else if (class_name == g_DictionaryM)
     {
         Error error;
         value = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr + ptr_size, ptr_size, 0, error);
@@ -267,6 +273,10 @@ lldb_private::formatters::NSDictionarySummaryProvider (ValueObject& valobj, Stre
             return false;
         value &= (is_64bit ? ~0xFC00000000000000UL : ~0xFC000000U);
     }
+    else if (class_name == g_Dictionary1)
+    {
+        value = 1;
+    }
     /*else if (!strcmp(class_name,"__NSCFDictionary"))
      {
      Error error;
@@ -279,10 +289,10 @@ lldb_private::formatters::NSDictionarySummaryProvider (ValueObject& valobj, Stre
     else
     {
         auto& map(NSDictionary_Additionals::GetAdditionalSummaries());
-        auto iter = map.find(class_name_cs), end = map.end();
+        auto iter = map.find(class_name), end = map.end();
         if (iter != end)
             return iter->second(valobj, stream, options);
-        if (!ExtractValueFromObjCExpression(valobj, "int", "count", value))
+        else
             return false;
     }
     
@@ -309,10 +319,10 @@ SyntheticChildrenFrontEnd* lldb_private::formatters::NSDictionarySyntheticFrontE
 {
     lldb::ProcessSP process_sp (valobj_sp->GetProcessSP());
     if (!process_sp)
-        return NULL;
+        return nullptr;
     ObjCLanguageRuntime *runtime = (ObjCLanguageRuntime*)process_sp->GetLanguageRuntime(lldb::eLanguageTypeObjC);
     if (!runtime)
-        return NULL;
+        return nullptr;
     
     CompilerType valobj_type(valobj_sp->GetCompilerType());
     Flags flags(valobj_type.GetTypeInfo());
@@ -322,111 +332,63 @@ SyntheticChildrenFrontEnd* lldb_private::formatters::NSDictionarySyntheticFrontE
         Error error;
         valobj_sp = valobj_sp->AddressOf(error);
         if (error.Fail() || !valobj_sp)
-            return NULL;
+            return nullptr;
     }
     
-    ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(*valobj_sp.get()));
+    ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(*valobj_sp));
     
-    if (!descriptor.get() || !descriptor->IsValid())
-        return NULL;
+    if (!descriptor || !descriptor->IsValid())
+        return nullptr;
     
-    ConstString class_name_cs = descriptor->GetClassName();
-    const char* class_name = class_name_cs.GetCString();
+    ConstString class_name(descriptor->GetClassName());
     
-    if (!class_name || !*class_name)
-        return NULL;
+    static const ConstString g_DictionaryI("__NSDictionaryI");
+    static const ConstString g_DictionaryM("__NSDictionaryM");
+    static const ConstString g_Dictionary1("__NSSingleEntryDictionaryI");
     
-    if (!strcmp(class_name,"__NSDictionaryI"))
+    if (class_name.IsEmpty())
+        return nullptr;
+    
+    if (class_name == g_DictionaryI)
     {
         return (new NSDictionaryISyntheticFrontEnd(valobj_sp));
     }
-    else if (!strcmp(class_name,"__NSDictionaryM"))
+    else if (class_name == g_DictionaryM)
     {
         return (new NSDictionaryMSyntheticFrontEnd(valobj_sp));
     }
+    else if (class_name == g_Dictionary1)
+    {
+        return (new NSDictionary1SyntheticFrontEnd(valobj_sp));
+    }
     else
     {
         auto& map(NSDictionary_Additionals::GetAdditionalSynthetics());
-        auto iter = map.find(class_name_cs), end = map.end();
+        auto iter = map.find(class_name), end = map.end();
         if (iter != end)
             return iter->second(synth, valobj_sp);
-        return (new NSDictionaryCodeRunningSyntheticFrontEnd(valobj_sp));
     }
-}
-
-lldb_private::formatters::NSDictionaryCodeRunningSyntheticFrontEnd::NSDictionaryCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd(*valobj_sp.get())
-{}
-
-size_t
-lldb_private::formatters::NSDictionaryCodeRunningSyntheticFrontEnd::CalculateNumChildren ()
-{
-    uint64_t count = 0;
-    if (ExtractValueFromObjCExpression(m_backend, "int", "count", count))
-        return count;
-    return 0;
-}
-
-lldb::ValueObjectSP
-lldb_private::formatters::NSDictionaryCodeRunningSyntheticFrontEnd::GetChildAtIndex (size_t idx)
-{
-    StreamString idx_name;
-    idx_name.Printf("[%" PRIu64 "]", (uint64_t)idx);
-    StreamString key_fetcher_expr;
-    key_fetcher_expr.Printf("(id)[(NSArray*)[(id)0x%" PRIx64 " allKeys] objectAtIndex:%" PRIu64 "]", m_backend.GetPointerValue(), (uint64_t)idx);
-    StreamString value_fetcher_expr;
-    value_fetcher_expr.Printf("(id)[(id)0x%" PRIx64 " objectForKey:(%s)]",m_backend.GetPointerValue(),key_fetcher_expr.GetData());
-    StreamString object_fetcher_expr;
-    object_fetcher_expr.Printf("struct __lldb_autogen_nspair { id key; id value; } _lldb_valgen_item; _lldb_valgen_item.key = %s; _lldb_valgen_item.value = %s; _lldb_valgen_item;",key_fetcher_expr.GetData(),value_fetcher_expr.GetData());
-    lldb::ValueObjectSP child_sp;
-    EvaluateExpressionOptions options;
-    options.SetKeepInMemory(true);
-    options.SetLanguage(lldb::eLanguageTypeObjC_plus_plus);
-    options.SetResultIsInternal(true);
-    m_backend.GetTargetSP()->EvaluateExpression(object_fetcher_expr.GetData(),
-                                                GetViableFrame(m_backend.GetTargetSP().get()),
-                                                child_sp,
-                                                options);
-    if (child_sp)
-        child_sp->SetName(ConstString(idx_name.GetData()));
-    return child_sp;
-}
-
-bool
-lldb_private::formatters::NSDictionaryCodeRunningSyntheticFrontEnd::Update()
-{
-    return false;
-}
-
-bool
-lldb_private::formatters::NSDictionaryCodeRunningSyntheticFrontEnd::MightHaveChildren ()
-{
-    return true;
-}
-
-size_t
-lldb_private::formatters::NSDictionaryCodeRunningSyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
-{
-    return 0;
+    
+    return nullptr;
 }
 
 lldb_private::formatters::NSDictionaryISyntheticFrontEnd::NSDictionaryISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd(*valobj_sp.get()),
-m_exe_ctx_ref(),
-m_ptr_size(8),
-m_order(lldb::eByteOrderInvalid),
-m_data_32(NULL),
-m_data_64(NULL),
-m_pair_type()
+    SyntheticChildrenFrontEnd(*valobj_sp),
+    m_exe_ctx_ref(),
+    m_ptr_size(8),
+    m_order(lldb::eByteOrderInvalid),
+    m_data_32(nullptr),
+    m_data_64(nullptr),
+    m_pair_type()
 {
 }
 
 lldb_private::formatters::NSDictionaryISyntheticFrontEnd::~NSDictionaryISyntheticFrontEnd ()
 {
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
 }
 
 size_t
@@ -452,9 +414,9 @@ lldb_private::formatters::NSDictionaryISyntheticFrontEnd::Update()
 {
     m_children.clear();
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
     m_ptr_size = 0;
     ValueObjectSP valobj_sp = m_backend.GetSP();
     if (!valobj_sp)
@@ -575,23 +537,113 @@ lldb_private::formatters::NSDictionaryISyntheticFrontEnd::GetChildAtIndex (size_
     return dict_item.valobj_sp;
 }
 
-lldb_private::formatters::NSDictionaryMSyntheticFrontEnd::NSDictionaryMSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
+lldb_private::formatters::NSDictionary1SyntheticFrontEnd::NSDictionary1SyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
 SyntheticChildrenFrontEnd(*valobj_sp.get()),
-m_exe_ctx_ref(),
-m_ptr_size(8),
-m_order(lldb::eByteOrderInvalid),
-m_data_32(NULL),
-m_data_64(NULL),
-m_pair_type()
+m_pair(nullptr)
+{
+}
+
+size_t
+lldb_private::formatters::NSDictionary1SyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
+{
+    static const ConstString g_zero("[0]");
+    
+    if (name == g_zero)
+        return 0;
+    
+    return UINT32_MAX;
+}
+
+size_t
+lldb_private::formatters::NSDictionary1SyntheticFrontEnd::CalculateNumChildren ()
+{
+    return 1;
+}
+
+bool
+lldb_private::formatters::NSDictionary1SyntheticFrontEnd::Update()
+{
+    m_pair.reset();
+    return false;
+}
+
+bool
+lldb_private::formatters::NSDictionary1SyntheticFrontEnd::MightHaveChildren ()
+{
+    return true;
+}
+
+lldb::ValueObjectSP
+lldb_private::formatters::NSDictionary1SyntheticFrontEnd::GetChildAtIndex (size_t idx)
+{
+    if (idx != 0)
+        return lldb::ValueObjectSP();
+    
+    if (m_pair.get())
+        return m_pair;
+    
+    auto process_sp(m_backend.GetProcessSP());
+    if (!process_sp)
+        return nullptr;
+    
+    auto ptr_size = process_sp->GetAddressByteSize();
+    
+    lldb::addr_t key_ptr = m_backend.GetValueAsUnsigned(LLDB_INVALID_ADDRESS) + ptr_size;
+    lldb::addr_t value_ptr = key_ptr + ptr_size;
+    
+    Error error;
+    
+    lldb::addr_t value_at_idx = process_sp->ReadPointerFromMemory(key_ptr, error);
+    if (error.Fail())
+        return nullptr;
+    lldb::addr_t key_at_idx = process_sp->ReadPointerFromMemory(value_ptr, error);
+    if (error.Fail())
+        return nullptr;
+    
+    auto pair_type = GetLLDBNSPairType(process_sp->GetTarget().shared_from_this());
+    
+    DataBufferSP buffer_sp(new DataBufferHeap(2*ptr_size,0));
+    
+    if (ptr_size == 8)
+    {
+        uint64_t *data_ptr = (uint64_t *)buffer_sp->GetBytes();
+        *data_ptr = key_at_idx;
+        *(data_ptr+1) = value_at_idx;
+    }
+    else
+    {
+        uint32_t *data_ptr = (uint32_t *)buffer_sp->GetBytes();
+        *data_ptr = key_ptr;
+        *(data_ptr+1) = value_ptr;
+    }
+    
+    DataExtractor data(buffer_sp, process_sp->GetByteOrder(), ptr_size);
+    m_pair = CreateValueObjectFromData("[0]",
+                                       data,
+                                       m_backend.GetExecutionContextRef(),
+                                       pair_type);
+
+    
+    return m_pair;
+}
+
+lldb_private::formatters::NSDictionaryMSyntheticFrontEnd::NSDictionaryMSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
+    SyntheticChildrenFrontEnd(*valobj_sp),
+    m_exe_ctx_ref(),
+    m_ptr_size(8),
+    m_order(lldb::eByteOrderInvalid),
+    m_data_32(nullptr),
+    m_data_64(nullptr),
+    m_pair_type()
 {
 }
 
 lldb_private::formatters::NSDictionaryMSyntheticFrontEnd::~NSDictionaryMSyntheticFrontEnd ()
 {
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
 }
 
 size_t
@@ -619,9 +671,9 @@ lldb_private::formatters::NSDictionaryMSyntheticFrontEnd::Update()
     ValueObjectSP valobj_sp = m_backend.GetSP();
     m_ptr_size = 0;
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
     if (!valobj_sp)
         return false;
     m_exe_ctx_ref = valobj_sp->GetExecutionContextRef();
diff --git a/source/Plugins/Language/ObjC/NSError.cpp b/source/Plugins/Language/ObjC/NSError.cpp
index c627cd031926..4bfb024206d3 100644
--- a/source/Plugins/Language/ObjC/NSError.cpp
+++ b/source/Plugins/Language/ObjC/NSError.cpp
@@ -34,27 +34,49 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::formatters;
 
-bool
-lldb_private::formatters::NSError_SummaryProvider (ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options)
+static lldb::addr_t
+DerefToNSErrorPointer (ValueObject& valobj)
 {
-    ProcessSP process_sp(valobj.GetProcessSP());
-    if (!process_sp)
-        return false;
-    
-    lldb::addr_t ptr_value = LLDB_INVALID_ADDRESS;
-    
     CompilerType valobj_type(valobj.GetCompilerType());
     Flags type_flags(valobj_type.GetTypeInfo());
     if (type_flags.AllClear(eTypeHasValue))
     {
         if (valobj.IsBaseClass() && valobj.GetParent())
-            ptr_value = valobj.GetParent()->GetValueAsUnsigned(LLDB_INVALID_ADDRESS);
+            return valobj.GetParent()->GetValueAsUnsigned(LLDB_INVALID_ADDRESS);
     }
     else
-        ptr_value = valobj.GetValueAsUnsigned(LLDB_INVALID_ADDRESS);
+    {
+        lldb::addr_t ptr_value = valobj.GetValueAsUnsigned(LLDB_INVALID_ADDRESS);
+        if (type_flags.AllSet(eTypeIsPointer))
+        {
+            CompilerType pointee_type(valobj_type.GetPointeeType());
+            Flags pointee_flags(pointee_type.GetTypeInfo());
+            if (pointee_flags.AllSet(eTypeIsPointer))
+            {
+                if (ProcessSP process_sp = valobj.GetProcessSP())
+                {
+                    Error error;
+                    ptr_value = process_sp->ReadPointerFromMemory(ptr_value, error);
+                }
+            }
+        }
+        return ptr_value;
+    }
+    
+    return LLDB_INVALID_ADDRESS;
+}
 
+bool
+lldb_private::formatters::NSError_SummaryProvider (ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options)
+{
+    ProcessSP process_sp(valobj.GetProcessSP());
+    if (!process_sp)
+        return false;
+    
+    lldb::addr_t ptr_value = DerefToNSErrorPointer(valobj);
     if (ptr_value == LLDB_INVALID_ADDRESS)
         return false;
+
     size_t ptr_size = process_sp->GetAddressByteSize();
     lldb::addr_t code_location = ptr_value + 2 * ptr_size;
     lldb::addr_t domain_location = ptr_value + 3 * ptr_size;
@@ -135,18 +157,7 @@ public:
         if (!process_sp)
             return false;
         
-        lldb::addr_t userinfo_location = LLDB_INVALID_ADDRESS;
-        
-        CompilerType valobj_type(m_backend.GetCompilerType());
-        Flags type_flags(valobj_type.GetTypeInfo());
-        if (type_flags.AllClear(eTypeHasValue))
-        {
-            if (m_backend.IsBaseClass() && m_backend.GetParent())
-                userinfo_location = m_backend.GetParent()->GetValueAsUnsigned(LLDB_INVALID_ADDRESS);
-        }
-        else
-            userinfo_location = m_backend.GetValueAsUnsigned(LLDB_INVALID_ADDRESS);
-
+        lldb::addr_t userinfo_location = DerefToNSErrorPointer(m_backend);
         if (userinfo_location == LLDB_INVALID_ADDRESS)
             return false;
         
@@ -158,10 +169,10 @@ public:
         if (userinfo == LLDB_INVALID_ADDRESS || error.Fail())
             return false;
         InferiorSizedWord isw(userinfo,*process_sp);
-        m_child_sp = ValueObject::CreateValueObjectFromData("_userInfo",
-                                                            isw.GetAsData(process_sp->GetByteOrder()),
-                                                            m_backend.GetExecutionContextRef(),
-                                                            process_sp->GetTarget().GetScratchClangASTContext()->GetBasicType(lldb::eBasicTypeObjCID));
+        m_child_sp = CreateValueObjectFromData("_userInfo",
+                                               isw.GetAsData(process_sp->GetByteOrder()),
+                                               m_backend.GetExecutionContextRef(),
+                                               process_sp->GetTarget().GetScratchClangASTContext()->GetBasicType(lldb::eBasicTypeObjCID));
         return false;
     }
     
diff --git a/source/Plugins/Language/ObjC/NSException.cpp b/source/Plugins/Language/ObjC/NSException.cpp
index e58223a4d461..f70e7c7356e1 100644
--- a/source/Plugins/Language/ObjC/NSException.cpp
+++ b/source/Plugins/Language/ObjC/NSException.cpp
@@ -157,10 +157,10 @@ public:
         if (userinfo == LLDB_INVALID_ADDRESS || error.Fail())
             return false;
         InferiorSizedWord isw(userinfo,*process_sp);
-        m_child_sp = ValueObject::CreateValueObjectFromData("userInfo",
-                                                            isw.GetAsData(process_sp->GetByteOrder()),
-                                                            m_backend.GetExecutionContextRef(),
-                                                            process_sp->GetTarget().GetScratchClangASTContext()->GetBasicType(lldb::eBasicTypeObjCID));
+        m_child_sp = CreateValueObjectFromData("userInfo",
+                                               isw.GetAsData(process_sp->GetByteOrder()),
+                                               m_backend.GetExecutionContextRef(),
+                                               process_sp->GetTarget().GetScratchClangASTContext()->GetBasicType(lldb::eBasicTypeObjCID));
         return false;
     }
     
diff --git a/source/Plugins/Language/ObjC/NSIndexPath.cpp b/source/Plugins/Language/ObjC/NSIndexPath.cpp
index 245f6da80c7f..0c8a54d76df1 100644
--- a/source/Plugins/Language/ObjC/NSIndexPath.cpp
+++ b/source/Plugins/Language/ObjC/NSIndexPath.cpp
@@ -31,6 +31,8 @@ class NSIndexPathSyntheticFrontEnd : public SyntheticChildrenFrontEnd
 public:
     NSIndexPathSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
     SyntheticChildrenFrontEnd (*valobj_sp.get()),
+    m_descriptor_sp(nullptr),
+    m_impl(),
     m_ptr_size(0),
     m_uint_star_type()
     {
@@ -169,9 +171,8 @@ protected:
         Invalid
     };
     
-    struct Impl {
-        Mode m_mode;
-
+    struct Impl
+    {
         size_t
         GetNumIndexes ()
         {
@@ -200,48 +201,52 @@ protected:
                     return m_outsourced.GetIndexAtIndex (idx);
             }
         }
-
-        struct InlinedIndexes {
+        
+        struct InlinedIndexes
+        {
         public:
-          void SetIndexes(uint64_t value, Process& p)
-          {
-              m_indexes = value;
-              _lengthForInlinePayload(p.GetAddressByteSize());
-              m_process = &p;
-          }
-              
-          size_t
-          GetNumIndexes ()
-          {
-              return m_count;
-          }
-
-          lldb::ValueObjectSP
-          GetIndexAtIndex (size_t idx, const CompilerType& desired_type)
-          {
-              std::pair<uint64_t, bool> value(_indexAtPositionForInlinePayload(idx));
-              if (!value.second)
-                  return nullptr;
-              
-              Value v;
-              if (m_ptr_size == 8)
-              {
-                  Scalar scalar( (unsigned long long)value.first );
-                  v = Value(scalar);
-              }
-              else
-              {
-                  Scalar scalar( (unsigned int)value.first );
-                  v = Value(scalar);
-              }
-
-              v.SetCompilerType(desired_type);
-
-              StreamString idx_name;
-              idx_name.Printf("[%" PRIu64 "]", (uint64_t)idx);
+            void SetIndexes(uint64_t value, Process& p)
+            {
+                m_indexes = value;
+                _lengthForInlinePayload(p.GetAddressByteSize());
+                m_process = &p;
+            }
+            
+            size_t
+            GetNumIndexes ()
+            {
+                return m_count;
+            }
+            
+            lldb::ValueObjectSP
+            GetIndexAtIndex (size_t idx, const CompilerType& desired_type)
+            {
+                if (!m_process)
+                    return nullptr;
 
-              return ValueObjectConstResult::Create(m_process, v, ConstString(idx_name.GetData()));
-          }
+                std::pair<uint64_t, bool> value(_indexAtPositionForInlinePayload(idx));
+                if (!value.second)
+                    return nullptr;
+                
+                Value v;
+                if (m_ptr_size == 8)
+                {
+                    Scalar scalar( (unsigned long long)value.first );
+                    v = Value(scalar);
+                }
+                else
+                {
+                    Scalar scalar( (unsigned int)value.first );
+                    v = Value(scalar);
+                }
+                
+                v.SetCompilerType(desired_type);
+                
+                StreamString idx_name;
+                idx_name.Printf("[%" PRIu64 "]", (uint64_t)idx);
+                
+                return ValueObjectConstResult::Create(m_process, v, ConstString(idx_name.GetData()));
+            }
             
             void
             Clear ()
@@ -251,53 +256,60 @@ protected:
                 m_ptr_size = 0;
                 m_process = nullptr;
             }
-                    
+            
+            InlinedIndexes () :
+            m_indexes(0),
+            m_count(0),
+            m_ptr_size(0),
+            m_process(nullptr)
+            {
+            }
+            
         private:
-          uint64_t m_indexes;
-          size_t m_count;
-          uint32_t m_ptr_size;
-          Process *m_process;
-                    
-          // cfr. Foundation for the details of this code
-          size_t _lengthForInlinePayload(uint32_t ptr_size) {
-              m_ptr_size = ptr_size;
-              if (m_ptr_size == 8)
-              m_count = ((m_indexes >> 3) & 0x7);
-              else
-              m_count = ((m_indexes >> 3) & 0x3);
-              return m_count;
-          }
-                    
-          std::pair<uint64_t, bool>
-          _indexAtPositionForInlinePayload(size_t pos)
-          {
-              if (m_ptr_size == 8)
-              {
-                switch (pos) {
-                    case 5: return {((m_indexes >> 51) & 0x1ff),true};
-                    case 4: return {((m_indexes >> 42) & 0x1ff),true};
-                    case 3: return {((m_indexes >> 33) & 0x1ff),true};
-                    case 2: return {((m_indexes >> 24) & 0x1ff),true};
-                    case 1: return {((m_indexes >> 15) & 0x1ff),true};
-                    case 0: return {((m_indexes >>  6) & 0x1ff),true};
+            uint64_t m_indexes;
+            size_t m_count;
+            uint32_t m_ptr_size;
+            Process *m_process;
+            
+            // cfr. Foundation for the details of this code
+            size_t _lengthForInlinePayload(uint32_t ptr_size) {
+                m_ptr_size = ptr_size;
+                if (m_ptr_size == 8)
+                    m_count = ((m_indexes >> 3) & 0x7);
+                else
+                    m_count = ((m_indexes >> 3) & 0x3);
+                return m_count;
+            }
+            
+            std::pair<uint64_t, bool>
+            _indexAtPositionForInlinePayload(size_t pos)
+            {
+                if (m_ptr_size == 8)
+                {
+                    switch (pos) {
+                        case 5: return {((m_indexes >> 51) & 0x1ff),true};
+                        case 4: return {((m_indexes >> 42) & 0x1ff),true};
+                        case 3: return {((m_indexes >> 33) & 0x1ff),true};
+                        case 2: return {((m_indexes >> 24) & 0x1ff),true};
+                        case 1: return {((m_indexes >> 15) & 0x1ff),true};
+                        case 0: return {((m_indexes >>  6) & 0x1ff),true};
+                    }
                 }
-              }
-              else
-                  {
-                  switch (pos) {
-                      case 2: return {((m_indexes >> 23) & 0x1ff),true};
-                      case 1: return {((m_indexes >> 14) & 0x1ff),true};
-                      case 0: return {((m_indexes >>  5) & 0x1ff),true};
-                  }
-              }
-              return {0,false};
-          }
-
+                else
+                {
+                    switch (pos) {
+                        case 2: return {((m_indexes >> 23) & 0x1ff),true};
+                        case 1: return {((m_indexes >> 14) & 0x1ff),true};
+                        case 0: return {((m_indexes >>  5) & 0x1ff),true};
+                    }
+                }
+                return {0,false};
+            }
+            
         };
-        struct OutsourcedIndexes {
-            ValueObject *m_indexes;
-            size_t m_count;
-                    
+
+        struct OutsourcedIndexes
+        {
             lldb::ValueObjectSP
             GetIndexAtIndex (size_t idx)
             {
@@ -315,9 +327,19 @@ protected:
                 m_indexes = nullptr;
                 m_count = 0;
             }
+            
+            OutsourcedIndexes () :
+            m_indexes(nullptr),
+            m_count(0)
+            {
+            }
+            
+            ValueObject *m_indexes;
+            size_t m_count;
         };
-
-        union {
+        
+        union
+        {
             struct InlinedIndexes m_inlined;
             struct OutsourcedIndexes m_outsourced;
         };
@@ -329,6 +351,13 @@ protected:
             m_inlined.Clear();
             m_outsourced.Clear();
         }
+        
+        Impl() :
+        m_mode(Mode::Invalid)
+        {
+        }
+        
+        Mode m_mode;
     } m_impl;
     
     uint32_t m_ptr_size;
diff --git a/source/Plugins/Language/ObjC/NSSet.cpp b/source/Plugins/Language/ObjC/NSSet.cpp
index 93115957e329..315771045ba6 100644
--- a/source/Plugins/Language/ObjC/NSSet.cpp
+++ b/source/Plugins/Language/ObjC/NSSet.cpp
@@ -94,33 +94,6 @@ namespace lldb_private {
             std::vector<SetItemDescriptor> m_children;
         };
         
-        class NSOrderedSetSyntheticFrontEnd : public SyntheticChildrenFrontEnd
-        {
-        public:
-            NSOrderedSetSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
-
-            ~NSOrderedSetSyntheticFrontEnd() override = default;
-
-            size_t
-            CalculateNumChildren() override;
-            
-            lldb::ValueObjectSP
-            GetChildAtIndex(size_t idx) override;
-            
-            bool
-            Update() override;
-            
-            bool
-            MightHaveChildren() override;
-            
-            size_t
-            GetIndexOfChildWithName(const ConstString &name) override;
-
-        private:
-            uint32_t m_count;
-            std::map<uint32_t,lldb::ValueObjectSP> m_children;
-        };
-        
         class NSSetMSyntheticFrontEnd : public SyntheticChildrenFrontEnd
         {
         public:
@@ -215,7 +188,7 @@ lldb_private::formatters::NSSetSummaryProvider (ValueObject& valobj, Stream& str
     
     ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(valobj));
     
-    if (!descriptor.get() || !descriptor->IsValid())
+    if (!descriptor || !descriptor->IsValid())
         return false;
     
     uint32_t ptr_size = process_sp->GetAddressByteSize();
@@ -277,7 +250,7 @@ lldb_private::formatters::NSSetSummaryProvider (ValueObject& valobj, Stream& str
         auto iter = map.find(class_name_cs), end = map.end();
         if (iter != end)
             return iter->second(valobj, stream, options);
-        if (!ExtractValueFromObjCExpression(valobj, "int", "count", value))
+        else
             return false;
     }
     
@@ -304,10 +277,10 @@ SyntheticChildrenFrontEnd* lldb_private::formatters::NSSetSyntheticFrontEndCreat
 {
     lldb::ProcessSP process_sp (valobj_sp->GetProcessSP());
     if (!process_sp)
-        return NULL;
+        return nullptr;
     ObjCLanguageRuntime *runtime = (ObjCLanguageRuntime*)process_sp->GetLanguageRuntime(lldb::eLanguageTypeObjC);
     if (!runtime)
-        return NULL;
+        return nullptr;
     
     CompilerType valobj_type(valobj_sp->GetCompilerType());
     Flags flags(valobj_type.GetTypeInfo());
@@ -317,19 +290,19 @@ SyntheticChildrenFrontEnd* lldb_private::formatters::NSSetSyntheticFrontEndCreat
         Error error;
         valobj_sp = valobj_sp->AddressOf(error);
         if (error.Fail() || !valobj_sp)
-            return NULL;
+            return nullptr;
     }
     
-    ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(*valobj_sp.get()));
+    ObjCLanguageRuntime::ClassDescriptorSP descriptor(runtime->GetClassDescriptor(*valobj_sp));
     
-    if (!descriptor.get() || !descriptor->IsValid())
-        return NULL;
+    if (!descriptor || !descriptor->IsValid())
+        return nullptr;
     
     ConstString class_name_cs = descriptor->GetClassName();
     const char* class_name = class_name_cs.GetCString();
     
     if (!class_name || !*class_name)
-        return NULL;
+        return nullptr;
     
     if (!strcmp(class_name,"__NSSetI"))
     {
@@ -339,26 +312,22 @@ SyntheticChildrenFrontEnd* lldb_private::formatters::NSSetSyntheticFrontEndCreat
     {
         return (new NSSetMSyntheticFrontEnd(valobj_sp));
     }
-    else if ((!strcmp(class_name,"__NSOrderedSetI")) || (!strcmp(class_name,"__NSOrderedSetM")))
-    {
-        return new NSOrderedSetSyntheticFrontEnd(valobj_sp); // this runs code
-    }
     else
     {
         auto& map(NSSet_Additionals::GetAdditionalSynthetics());
         auto iter = map.find(class_name_cs), end = map.end();
         if (iter != end)
             return iter->second(synth, valobj_sp);
-        return /*(new NSSetCodeRunningSyntheticFrontEnd(valobj_sp))*/ NULL;
+        return nullptr;
     }
 }
 
 lldb_private::formatters::NSSetISyntheticFrontEnd::NSSetISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd(*valobj_sp.get()),
-m_exe_ctx_ref(),
-m_ptr_size(8),
-m_data_32(NULL),
-m_data_64(NULL)
+    SyntheticChildrenFrontEnd(*valobj_sp),
+    m_exe_ctx_ref(),
+    m_ptr_size(8),
+    m_data_32(nullptr),
+    m_data_64(nullptr)
 {
     if (valobj_sp)
         Update();
@@ -367,9 +336,9 @@ m_data_64(NULL)
 lldb_private::formatters::NSSetISyntheticFrontEnd::~NSSetISyntheticFrontEnd ()
 {
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
 }
 
 size_t
@@ -395,9 +364,9 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::Update()
 {
     m_children.clear();
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
     m_ptr_size = 0;
     ValueObjectSP valobj_sp = m_backend.GetSP();
     if (!valobj_sp)
@@ -521,11 +490,11 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::GetChildAtIndex (size_t idx)
 }
 
 lldb_private::formatters::NSSetMSyntheticFrontEnd::NSSetMSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd(*valobj_sp.get()),
-m_exe_ctx_ref(),
-m_ptr_size(8),
-m_data_32(NULL),
-m_data_64(NULL)
+    SyntheticChildrenFrontEnd(*valobj_sp),
+    m_exe_ctx_ref(),
+    m_ptr_size(8),
+    m_data_32(nullptr),
+    m_data_64(nullptr)
 {
     if (valobj_sp)
         Update ();
@@ -534,9 +503,9 @@ m_data_64(NULL)
 lldb_private::formatters::NSSetMSyntheticFrontEnd::~NSSetMSyntheticFrontEnd ()
 {
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
 }
 
 size_t
@@ -564,9 +533,9 @@ lldb_private::formatters::NSSetMSyntheticFrontEnd::Update()
     ValueObjectSP valobj_sp = m_backend.GetSP();
     m_ptr_size = 0;
     delete m_data_32;
-    m_data_32 = NULL;
+    m_data_32 = nullptr;
     delete m_data_64;
-    m_data_64 = NULL;
+    m_data_64 = nullptr;
     if (!valobj_sp)
         return false;
     if (!valobj_sp)
@@ -688,69 +657,6 @@ lldb_private::formatters::NSSetMSyntheticFrontEnd::GetChildAtIndex (size_t idx)
     return set_item.valobj_sp;
 }
 
-lldb_private::formatters::NSOrderedSetSyntheticFrontEnd::NSOrderedSetSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
-SyntheticChildrenFrontEnd(*valobj_sp.get()),
-m_count(UINT32_MAX),
-m_children()
-{}
-
-size_t
-lldb_private::formatters::NSOrderedSetSyntheticFrontEnd::CalculateNumChildren ()
-{
-    if (m_count != UINT32_MAX)
-        return m_count;
-    uint64_t count_temp;
-    if (ExtractValueFromObjCExpression(m_backend,"unsigned int","count",count_temp))
-        return (m_count = count_temp);
-    return (m_count = 0);
-}
-
-lldb::ValueObjectSP
-lldb_private::formatters::NSOrderedSetSyntheticFrontEnd::GetChildAtIndex (size_t idx)
-{
-    auto iter = m_children.find(idx);
-    if (iter == m_children.end())
-    {
-        lldb::ValueObjectSP retval_sp;
-        if (idx <= m_count)
-        {
-            retval_sp = CallSelectorOnObject(m_backend, "id", "objectAtIndex", idx);
-            if (retval_sp)
-            {
-                StreamString idx_name;
-                idx_name.Printf("[%" PRIu64 "]", (uint64_t)idx);
-                retval_sp->SetName(ConstString(idx_name.GetData()));
-            }
-            m_children[idx] = retval_sp;
-        }
-        return retval_sp;
-    }
-    else
-        return iter->second;
-}
-
-bool
-lldb_private::formatters::NSOrderedSetSyntheticFrontEnd::Update()
-{
-    return false;
-}
-
-bool
-lldb_private::formatters::NSOrderedSetSyntheticFrontEnd::MightHaveChildren ()
-{
-    return true;
-}
-
-size_t
-lldb_private::formatters::NSOrderedSetSyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
-{
-    const char* item_name = name.GetCString();
-    uint32_t idx = ExtractIndexFromString(item_name);
-    if (idx < UINT32_MAX && idx >= CalculateNumChildren())
-        return UINT32_MAX;
-    return idx;
-}
-
 template bool
 lldb_private::formatters::NSSetSummaryProvider<true> (ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options);
 
diff --git a/source/Plugins/Language/ObjC/ObjCLanguage.cpp b/source/Plugins/Language/ObjC/ObjCLanguage.cpp
index 91a3a0fb4299..0ecbfd35b1a2 100644
--- a/source/Plugins/Language/ObjC/ObjCLanguage.cpp
+++ b/source/Plugins/Language/ObjC/ObjCLanguage.cpp
@@ -61,6 +61,7 @@ ObjCLanguage::GetPluginNameStatic()
 //------------------------------------------------------------------
 // PluginInterface protocol
 //------------------------------------------------------------------
+
 lldb_private::ConstString
 ObjCLanguage::GetPluginName()
 {
@@ -76,6 +77,7 @@ ObjCLanguage::GetPluginVersion()
 //------------------------------------------------------------------
 // Static Functions
 //------------------------------------------------------------------
+
 Language *
 ObjCLanguage::CreateInstance (lldb::LanguageType language)
 {
@@ -192,7 +194,7 @@ ObjCLanguage::MethodName::GetClassNameWithCategory ()
                 m_class_category.SetCStringWithLength (class_start, space_pos - class_start);
                 // If m_class hasn't been filled in and the class with category doesn't
                 // contain a '(', then we can also fill in the m_class
-                if (!m_class && strchr (m_class_category.GetCString(), '(') == NULL)
+                if (!m_class && strchr(m_class_category.GetCString(), '(') == nullptr)
                 {
                     m_class = m_class_category;
                     // No '(' was found in the full name, we can definitively say
@@ -451,6 +453,7 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("NSMutableArray"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSArrayI"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSArray0"), appkit_flags);
+    AddCXXSummary(objc_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSSingleObjectArrayI"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSArrayM"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSCFArray"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("CFArrayRef"), appkit_flags);
@@ -460,6 +463,7 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("NSMutableDictionary"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("__NSCFDictionary"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("__NSDictionaryI"), appkit_flags);
+    AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("__NSSingleEntryDictionaryI"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("__NSDictionaryM"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<true>, "NSDictionary summary provider", ConstString("CFDictionaryRef"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<true>, "NSDictionary summary provider", ConstString("CFMutableDictionaryRef"), appkit_flags);
@@ -487,6 +491,7 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSArrayM"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSArrayI"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSArray0"), ScriptedSyntheticChildren::Flags());
+    AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSSingleObjectArrayI"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("NSArray"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("NSMutableArray"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSCFArray"), ScriptedSyntheticChildren::Flags());
@@ -495,6 +500,7 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("__NSDictionaryM"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("__NSDictionaryI"), ScriptedSyntheticChildren::Flags());
+    AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("__NSSingleEntryDictionaryI"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("__NSCFDictionary"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("NSDictionary"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(objc_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("NSMutableDictionary"), ScriptedSyntheticChildren::Flags());
@@ -532,6 +538,7 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSCFConstantString"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSCFString"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSPathStore2"), appkit_flags);
+    AddCXXSummary(objc_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSTaggedPointerString"), appkit_flags);
     
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSAttributedStringSummaryProvider, "NSAttributedString summary provider", ConstString("NSAttributedString"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSMutableAttributedStringSummaryProvider, "NSMutableAttributedString summary provider", ConstString("NSMutableAttributedString"), appkit_flags);
@@ -540,6 +547,7 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSBundleSummaryProvider, "NSBundle summary provider", ConstString("NSBundle"), appkit_flags);
     
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("NSData"), appkit_flags);
+    AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("_NSInlineData"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("NSConcreteData"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("NSConcreteMutableData"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("NSMutableData"), appkit_flags);
@@ -551,10 +559,7 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSNotificationSummaryProvider, "NSNotification summary provider", ConstString("NSNotification"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSNotificationSummaryProvider, "NSNotification summary provider", ConstString("NSConcreteNotification"), appkit_flags);
-    
-    AddStringSummary(objc_category_sp, "domain: ${var._domain} - code: ${var._code}", ConstString("NSError"), appkit_flags);
-    AddStringSummary(objc_category_sp,"name:${var.name%S} reason:${var.reason%S}",ConstString("NSException"),appkit_flags);
-    
+        
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSNumber"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "CFNumberRef summary provider", ConstString("CFNumberRef"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("__NSCFBoolean"), appkit_flags);
@@ -562,11 +567,6 @@ LoadObjCFormatters(TypeCategoryImplSP objc_category_sp)
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSCFBoolean"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSCFNumber"), appkit_flags);
     
-    AddCXXSummary(objc_category_sp, lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider, "NSDecimalNumber summary provider", ConstString("NSDecimalNumber"), appkit_flags);
-    AddCXXSummary(objc_category_sp, lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider, "NSHost summary provider", ConstString("NSHost"), appkit_flags);
-    AddCXXSummary(objc_category_sp, lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider, "NSTask summary provider", ConstString("NSTask"), appkit_flags);
-    AddCXXSummary(objc_category_sp, lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider, "NSValue summary provider", ConstString("NSValue"), appkit_flags);
-    
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSURLSummaryProvider, "NSURL summary provider", ConstString("NSURL"), appkit_flags);
     AddCXXSummary(objc_category_sp, lldb_private::formatters::NSURLSummaryProvider, "NSURL summary provider", ConstString("CFURLRef"), appkit_flags);
     
@@ -732,7 +732,7 @@ ObjCLanguage::GetTypeScavenger ()
                     ConstString key_cs(key);
                     
                     if (clang_modules_decl_vendor->FindDecls(key_cs, false, UINT32_MAX, decls) > 0 &&
-                        decls.size() > 0)
+                        !decls.empty())
                     {
                         CompilerType module_type = ClangASTContext::GetTypeForDecl(decls.front());
                         result = true;
diff --git a/source/Plugins/Language/ObjC/ObjCLanguage.h b/source/Plugins/Language/ObjC/ObjCLanguage.h
index e30aa18c0443..b1435d26429a 100644
--- a/source/Plugins/Language/ObjC/ObjCLanguage.h
+++ b/source/Plugins/Language/ObjC/ObjCLanguage.h
@@ -12,6 +12,7 @@
 
 // C Includes
 // C++ Includes
+#include <cstring>
 #include <vector>
 
 // Other libraries and framework includes
@@ -187,7 +188,7 @@ public:
         if (!name)
             return false;
             
-        if (strchr(name, ':') == NULL)
+        if (strchr(name, ':') == nullptr)
             return true;
         else if (name[strlen(name) - 1] == ':')
             return true;