From f3fbd1c0586ff6ec7895991e6c28f61a503c36a8 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 23 Jul 2016 20:50:09 +0000
Subject: Vendor import of lldb release_39 branch r276489:
 https://llvm.org/svn/llvm-project/lldb/branches/release_39@276489

---
 source/Interpreter/OptionValueProperties.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'source/Interpreter/OptionValueProperties.cpp')

diff --git a/source/Interpreter/OptionValueProperties.cpp b/source/Interpreter/OptionValueProperties.cpp
index a3c28f70270f4..7024c3601d9f5 100644
--- a/source/Interpreter/OptionValueProperties.cpp
+++ b/source/Interpreter/OptionValueProperties.cpp
@@ -164,8 +164,23 @@ OptionValueProperties::GetSubValue (const ExecutionContext *exe_ctx,
             switch (sub_name[0])
             {
             case '.':
-                return value_sp->GetSubValue (exe_ctx, sub_name + 1, will_modify, error);
-            
+            {
+                lldb::OptionValueSP return_val_sp;
+                return_val_sp = value_sp->GetSubValue (exe_ctx, sub_name + 1, will_modify, error);
+                if (!return_val_sp)
+                {
+                    if (Properties::IsSettingExperimental(sub_name + 1))
+                    {
+                        size_t experimental_len = strlen(Properties::GetExperimentalSettingsName()); 
+                        if (*(sub_name + experimental_len + 1) == '.')
+                        return_val_sp = value_sp->GetSubValue(exe_ctx, sub_name + experimental_len + 2, will_modify, error);
+                        // It isn't an error if an experimental setting is not present.
+                        if (!return_val_sp)
+                            error.Clear();
+                    }
+                }
+                return return_val_sp;
+            }
             case '{':
                 // Predicate matching for predicates like
                 // "<setting-name>{<predicate>}"
-- 
cgit v1.2.3