Skip to content

Conversation

bulbazord
Copy link
Member

This is a follow-up to 14d95b2. I would have changed it in that commit, but I don't build the intel-pt plugin so I didn't see this until later.

This is a follow-up to 14d95b2. I would
have changed it in that commit, but I don't build the intel-pt plugin so
I didn't see this until later.
@llvmbot
Copy link
Member

llvmbot commented Sep 19, 2023

@llvm/pr-subscribers-lldb

Changes

This is a follow-up to 14d95b2. I would have changed it in that commit, but I don't build the intel-pt plugin so I didn't see this until later.


Full diff: https://github.com/llvm/llvm-project/pull/66721.diff

2 Files Affected:

  • (modified) lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp (+2-2)
  • (modified) lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h (+1-1)
diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
index bcac731713bb24b..015faa89fcfada8 100644
--- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
+++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
@@ -48,8 +48,8 @@ enum {
 #include "TraceIntelPTPropertiesEnum.inc"
 };
 
-ConstString TraceIntelPT::PluginProperties::GetSettingName() {
-  return ConstString(TraceIntelPT::GetPluginNameStatic());
+llvm::StringRef TraceIntelPT::PluginProperties::GetSettingName() {
+  return TraceIntelPT::GetPluginNameStatic();
 }
 
 TraceIntelPT::PluginProperties::PluginProperties() : Properties() {
diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h
index 20faabdce790241..da9cefe9ed95d67 100644
--- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h
+++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h
@@ -26,7 +26,7 @@ class TraceIntelPT : public Trace {
   /// Properties to be used with the `settings` command.
   class PluginProperties : public Properties {
   public:
-    static ConstString GetSettingName();
+    static llvm::StringRef GetSettingName();
 
     PluginProperties();
 

@bulbazord bulbazord merged commit 45e6e4d into llvm:main Sep 19, 2023
@bulbazord bulbazord deleted the intel-pt-const-string branch September 19, 2023 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants