Fixed name lookups for names that contain "::" but aren't actually C++ qualified...

To do this, I fixed the  CPPLanguageRuntime::StripNamespacesFromVariableName() function to use a regular expression that correctly determines if the name passed to it is a qualfied C++ name like "a::b::c" or "b::c". The old version of this function was treating '__54-[NSUserScriptTask executeWithInterpreter:arguments::]_block_invoke' as a match with a basename of ']_block_invoke'.

Also fixed a case in the by name lookup of functions where we wouldn't look for the full name if we actually tried to call CPPLanguageRuntime::StripNamespacesFromVariableName() and got an empty basename back.

<rdar://problem/18527866>

llvm-svn: 220432

diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index 4e985c0..f275528 100644 (file)
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -1730,6 +1730,8 @@ Module::PrepareForFunctionNameLookup (const ConstString &name,
             {
                 if (CPPLanguageRuntime::StripNamespacesFromVariableName (name_cstr, base_name_start, base_name_end))
                     lookup_name_type_mask |= (eFunctionNameTypeMethod | eFunctionNameTypeBase);
+                else
+                    lookup_name_type_mask = eFunctionNameTypeFull;
             }
             else
             {

diff --git a/lldb/source/Target/CPPLanguageRuntime.cpp b/lldb/source/Target/CPPLanguageRuntime.cpp
index f5b7f7f..c928912 100644 (file)
--- a/lldb/source/Target/CPPLanguageRuntime.cpp
+++ b/lldb/source/Target/CPPLanguageRuntime.cpp
@@ -192,28 +192,19 @@ CPPLanguageRuntime::IsCPPMangledName (const char *name)
 bool
 CPPLanguageRuntime::StripNamespacesFromVariableName (const char *name, const char *&base_name_start, const char *&base_name_end)
 {
-    if (base_name_end == NULL)
-        base_name_end = name + strlen (name);
-    
-    const char *last_colon = strrchr (name, ':');
-    
-    if (last_colon == NULL)
+    static RegularExpression g_basename_regex("([A-Za-z_][A-Za-z_0-9]*::)+([A-Za-z_][A-Za-z_0-9]*)$");
+    RegularExpression::Match match(2);
+    if (g_basename_regex.Execute (name, &match))
     {
-        base_name_start = name;
-        return true;
-    }
-    
-    // Can't have a C++ name that begins with a single ':', nor contains an internal single ':'
-    if (last_colon == name)
-        return false;
-    else if (last_colon[-1] != ':')
-        return false;
-    else
-    {
-        // FIXME: should check if there is
-        base_name_start = last_colon + 1;
-        return true;
+        llvm::StringRef basename;
+        if (match.GetMatchAtIndex(name, 2, basename))
+        {
+            base_name_start = basename.data();
+            base_name_end = base_name_start + basename.size();
+            return true;
+        }
     }
+    return false;
 }
 
 uint32_t