Make demangling more generalized

Author: ds5678

sources/LLVMSharp.Interop/llvmsharp/llvmsharp.cs

@@ -358,10 +358,6 @@ public static unsafe partial class llvmsharp
     [DllImport("libLLVMSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "llvmsharp_PassManager_add", ExactSpelling = true)]
     public static extern void PassManager_add([NativeTypeName("LLVMPassManagerRef")] LLVMOpaquePassManager* pass_manager, [NativeTypeName("LLVMPassRef")] LLVMOpaquePass* pass);
 
-    [DllImport("libLLVMSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "llvmsharp_Value_getDemangledName", ExactSpelling = true)]
-    [return: NativeTypeName("int32_t")]
-    public static extern int Value_getDemangledName([NativeTypeName("LLVMValueRef")] LLVMOpaqueValue* value, [NativeTypeName("char *")] sbyte* buffer, [NativeTypeName("int32_t")] int buffer_size);
-
     [DllImport("libLLVMSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "llvmsharp_createDeadCodeEliminationPass", ExactSpelling = true)]
     [return: NativeTypeName("LLVMPassRef")]
     public static extern LLVMOpaquePass* createDeadCodeEliminationPass();
@@ -426,6 +422,10 @@ public static unsafe partial class llvmsharp
     [return: NativeTypeName("LLVMPassRef")]
     public static extern LLVMOpaquePass* createUnifyLoopExitsPass();
 
+    [DllImport("libLLVMSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "llvmsharp_Demangle", ExactSpelling = true)]
+    [return: NativeTypeName("int32_t")]
+    public static extern int Demangle([NativeTypeName("const char *")] sbyte* mangled_string, [NativeTypeName("int32_t")] int mangled_string_size, [NativeTypeName("char *")] sbyte* buffer, [NativeTypeName("int32_t")] int buffer_size);
+
     [DllImport("libLLVMSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "llvmsharp_Free", ExactSpelling = true)]
     public static extern void Free(void* obj);
 }

sources/libLLVMSharp/LLVMSharp.cpp

@@ -445,16 +445,6 @@ void llvmsharp_PassManager_add(LLVMPassManagerRef pass_manager, LLVMPassRef pass
     unwrap(pass_manager)->add(unwrap(pass));
 }
 
-int32_t llvmsharp_Value_getDemangledName(LLVMValueRef value, char* buffer, int32_t buffer_size)
-{
-    const char* mangled = LLVMGetValueName(value);
-    std::string result = llvm::demangle(std::string_view(mangled));
-    int32_t length = (int32_t)result.length();
-    int32_t size = length < buffer_size ? length : buffer_size;
-    memcpy(buffer, result.c_str(), size);
-    return length;
-}
-
 LLVMPassRef llvmsharp_createDeadCodeEliminationPass()
 {
     return wrap((Pass*)createDeadCodeEliminationPass());
@@ -535,6 +525,15 @@ LLVMPassRef llvmsharp_createUnifyLoopExitsPass()
     return wrap((Pass*)createUnifyLoopExitsPass());
 }
 
+int32_t llvmsharp_Demangle(const char* mangled_string, int32_t mangled_string_size, char* buffer, int32_t buffer_size)
+{
+    std::string result = llvm::demangle(std::string_view(mangled_string, mangled_string_size));
+    int32_t length = (int32_t)result.length();
+    int32_t size = length < buffer_size ? length : buffer_size;
+    memcpy(buffer, result.c_str(), size);
+    return length;
+}
+
 void llvmsharp_Free(void* obj)
 {
     free(obj);

sources/libLLVMSharp/LLVMSharp.h

@@ -179,8 +179,6 @@ LLVMSHARP_LINKAGE void llvmsharp_Module_GetIdentifiedStructTypes(LLVMModuleRef m
 
 LLVMSHARP_LINKAGE void llvmsharp_PassManager_add(LLVMPassManagerRef pass_manager, LLVMPassRef pass);
 
-LLVMSHARP_LINKAGE int32_t llvmsharp_Value_getDemangledName(LLVMValueRef value, char* buffer, int32_t buffer_size);
-
 LLVMSHARP_LINKAGE LLVMPassRef llvmsharp_createDeadCodeEliminationPass();
 
 LLVMSHARP_LINKAGE LLVMPassRef llvmsharp_createSROAPass(uint8_t PreserveCFG);
@@ -213,6 +211,8 @@ LLVMSHARP_LINKAGE LLVMPassRef llvmsharp_createLoopSimplifyPass();
 
 LLVMSHARP_LINKAGE LLVMPassRef llvmsharp_createUnifyLoopExitsPass();
 
+LLVMSHARP_LINKAGE int32_t llvmsharp_Demangle(const char* mangled_string, int32_t mangled_string_size, char* buffer, int32_t buffer_size);
+
 LLVMSHARP_LINKAGE void llvmsharp_Free(void* obj);
 
 LLVM_CLANG_C_EXTERN_C_END