From 74de8db20e12714dce72ad3bc1ef6cac4149bf9f Mon Sep 17 00:00:00 2001
From: Elias Boutaleb <e.boutaleb@hotmail.fr>
Date: Wed, 6 Jul 2016 15:01:20 +0200
Subject: [PATCH 2/3] Demangling OCaml function symbols

---
 source/Core/Mangled.cpp                            | 12 ++++-
 source/Plugins/Language/OCaml/OCamlLanguage.cpp    | 51 ++++++++++++++++++++++
 source/Plugins/Language/OCaml/OCamlLanguage.h      |  6 +++
 .../Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp  | 10 +++++
 4 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/source/Core/Mangled.cpp b/source/Core/Mangled.cpp
index 543b34e..a1d4923 100644
--- a/source/Core/Mangled.cpp
+++ b/source/Core/Mangled.cpp
@@ -42,6 +42,7 @@
 #include "lldb/Core/Timer.h"
 #include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
 #include "Plugins/Language/ObjC/ObjCLanguage.h"
+#include "Plugins/Language/OCaml/OCamlLanguage.h"
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -348,6 +349,13 @@ Mangled::GetDemangledName (lldb::LanguageType language) const
                 m_demangled.SetCStringWithMangledCounterpart(demangled_name, m_mangled);
                 free(demangled_name);
             }
+        } else if (mangling_scheme == eManglingSchemeNone &&
+            !m_mangled.GetMangledCounterpart(m_demangled) &&
+            OCamlLanguage::IsOCamlMangledName(std::string(mangled_name)))
+        {
+            std::string demangled(OCamlLanguage::DemangleSym(std::string(mangled_name)));
+            if (!demangled.empty())
+                m_demangled.SetCString(demangled.c_str());
         }
         if (!m_demangled)
         {
@@ -356,7 +364,6 @@ Mangled::GetDemangledName (lldb::LanguageType language) const
             m_demangled.SetCString("");
         }
     }
-
     return m_demangled;
 }
 
@@ -469,6 +476,9 @@ Mangled::GuessLanguage () const
                 return lldb::eLanguageTypeC_plus_plus;
             else if (ObjCLanguage::IsPossibleObjCMethodName(mangled_name))
                 return lldb::eLanguageTypeObjC;
+            else if (OCamlLanguage::IsOCamlMangledName(std::string(mangled_name))) {
+                return lldb::eLanguageTypeOCaml;
+            }
         }
     }
     return lldb::eLanguageTypeUnknown;
diff --git a/source/Plugins/Language/OCaml/OCamlLanguage.cpp b/source/Plugins/Language/OCaml/OCamlLanguage.cpp
index abc6c8b..75b07eb 100644
--- a/source/Plugins/Language/OCaml/OCamlLanguage.cpp
+++ b/source/Plugins/Language/OCaml/OCamlLanguage.cpp
@@ -76,3 +76,54 @@ OCamlLanguage::IsNilReference(ValueObject &valobj)
     return valobj.GetValueAsUnsigned(UINT64_MAX) == 0;
 }
 
+bool
+OCamlLanguage::IsOCamlMangledName(std::string sym)
+{
+    std::string::size_type i = sym.find("caml");
+    if (i != std::string::npos && isupper(sym[4])) {
+        std::string::size_type j = sym.find("__");
+        if (j != std::string::npos)
+            return true;
+    }
+
+    return false;
+}
+
+std::string
+remove_stamp(std::string s)
+{
+    std::string::reverse_iterator rit = s.rbegin();
+    while(isdigit(*rit)) ++rit;
+    std::string new_str(s.begin(), rit.base());
+
+    if (new_str.back() == '_' && new_str != s) {
+        new_str.pop_back();
+        return new_str;
+    }
+
+    return s;
+}
+
+// assumes the param is indeed a ocaml symbol
+std::string
+OCamlLanguage::DemangleSym(std::string s)
+{
+    std::string module_n;
+    std::string::size_type i = s.find("caml");
+    if (i != std::string::npos && i == 0) {
+        s.erase(i, 4);
+
+        std::string::size_type j = s.find("__");
+        if (j != std::string::npos) {
+            module_n = s.substr(0,j);
+            s.erase(0, module_n.length()+2);
+        } else {
+            return "";
+        }
+
+        s = remove_stamp(s);
+        return module_n + "." + s;
+    }
+
+    return "";
+}
diff --git a/source/Plugins/Language/OCaml/OCamlLanguage.h b/source/Plugins/Language/OCaml/OCamlLanguage.h
index 33e3761..7bfff0c 100644
--- a/source/Plugins/Language/OCaml/OCamlLanguage.h
+++ b/source/Plugins/Language/OCaml/OCamlLanguage.h
@@ -54,6 +54,12 @@ public:
 
     bool
     IsNilReference(ValueObject &valobj) override;
+
+    static bool
+    IsOCamlMangledName(std::string mangled_name);
+
+    static std::string
+    DemangleSym(std::string s);
 };
 
 } // namespace lldb_private
diff --git a/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp b/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
index c5d7568..f52448e 100644
--- a/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+++ b/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
@@ -19,6 +19,7 @@
 #include "lldb/Symbol/LineTable.h"
 #include "lldb/Symbol/ObjectFile.h"
 #include "Plugins/Language/ObjC/ObjCLanguage.h"
+#include "Plugins/Language/OCaml/OCamlLanguage.h"
 
 #include "DWARFDebugAbbrev.h"
 #include "DWARFDebugAranges.h"
@@ -929,6 +930,15 @@ DWARFCompileUnit::IndexPrivate (DWARFCompileUnit* dwarf_cu,
                         }
                     }
 
+                    if (!is_method && cu_language == eLanguageTypeOCaml) {
+                        if (OCamlLanguage::IsOCamlMangledName(std::string(name))) {
+                            std::string demangled(OCamlLanguage::DemangleSym(std::string(name)));
+                            if (!demangled.empty()) {
+                                func_fullnames.Insert (ConstString(demangled.c_str()), DIERef(cu_offset, die.GetOffset()));
+                                continue;
+                            }
+                        }
+                    }
 
                     if (is_method)
                         func_methods.Insert (ConstString(name), DIERef(cu_offset, die.GetOffset()));
-- 
2.7.4

