Index: lldb/trunk/include/lldb/Core/Mangled.h
===================================================================
--- lldb/trunk/include/lldb/Core/Mangled.h
+++ lldb/trunk/include/lldb/Core/Mangled.h
@@ -298,12 +298,12 @@
     SetValue (const ConstString &name);
 
     //----------------------------------------------------------------------
-    /// Get the language only if it is definitive what the language is from
-    /// the mangling.
+    /// Try to guess the language from the mangling.
     ///
     /// For a mangled name to have a language it must have both a mangled
-    /// and a demangled name and it must be definitive from the mangling
-    /// what the language is.
+    /// and a demangled name and it can be guessed from the mangling what
+    /// the language is.  Note: this will return C++ for any language that
+    /// uses Itanium ABI mangling.
     ///
     /// Standard C function names will return eLanguageTypeUnknown because
     /// they aren't mangled and it isn't clear what language the name
@@ -314,7 +314,7 @@
     ///     if there is no mangled or demangled counterpart.
     //----------------------------------------------------------------------
     lldb::LanguageType
-    GetLanguage ();
+    GuessLanguage ();
 
 private:
     //----------------------------------------------------------------------
Index: lldb/trunk/source/Core/Mangled.cpp
===================================================================
--- lldb/trunk/source/Core/Mangled.cpp
+++ lldb/trunk/source/Core/Mangled.cpp
@@ -423,7 +423,7 @@
 }
 
 lldb::LanguageType
-Mangled::GetLanguage ()
+Mangled::GuessLanguage ()
 {
     ConstString mangled = GetMangledName();
     if (mangled)