1 files changed, 5 insertions, 10 deletions
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
index 7a18373e30f..d491683f687 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
@@ -931,16 +931,10 @@ UnwindAssembly_x86::CreateInstance (const ArchSpec &arch)
 // PluginInterface protocol in UnwindAssemblyParser_x86
 //------------------------------------------------------------------
 
-const char *
+ConstString
 UnwindAssembly_x86::GetPluginName()
 {
-    return "UnwindAssembly_x86";
-}
-
-const char *
-UnwindAssembly_x86::GetShortPluginName()
-{
-    return "unwindassembly.x86";
+    return GetPluginNameStatic();
 }
 
 
@@ -965,10 +959,11 @@ UnwindAssembly_x86::Terminate()
 }
 
 
-const char *
+lldb_private::ConstString
 UnwindAssembly_x86::GetPluginNameStatic()
 {
-    return "UnwindAssembly_x86";
+    static ConstString g_name("x86");
+    return g_name;
 }
 
 const char *