Merge pull request #6394 from Michael137/bugfix/lldb-ignore-ranges-frame-var-to-20221013

[cherry-pick][stable/20221013] Revert "[lldb] Ignore libcxx std::ranges global variables in frame var"

Author: Michael137

lldb/include/lldb/Target/LanguageRuntime.h

@@ -172,11 +172,6 @@ class LanguageRuntime : public Runtime, public PluginInterface {
     return llvm::None;
   }
 
-  /// Returns 'true' if we the variable with the specified 'name'
-  /// should be hidden from variable views (e.g., when listing variables in
-  /// 'frame variable' or 'target variable')
-  virtual bool ShouldHideVariable(llvm::StringRef name) const { return false; }
-
   void ModulesDidLoad(const ModuleList &module_list) override {}
 
   // Called by ClangExpressionParser::PrepareForExecution to query for any

lldb/source/Core/ValueObject.cpp

@@ -1679,20 +1679,12 @@ bool ValueObject::IsRuntimeSupportValue() {
   if (!process)
     return false;
 
-  if (!GetVariable())
-    return false;
-
-  auto *runtime = process->GetLanguageRuntime(GetVariable()->GetLanguage());
-  if (runtime)
-    if (runtime->ShouldHideVariable(GetName().GetStringRef()))
-      return true;
-
   // We trust that the compiler did the right thing and marked runtime support
   // values as artificial.
-  if (!GetVariable()->IsArtificial())
+  if (!GetVariable() || !GetVariable()->IsArtificial())
     return false;
 
-  if (runtime)
+  if (auto *runtime = process->GetLanguageRuntime(GetVariable()->GetLanguage()))
     if (runtime->IsAllowedRuntimeValue(GetName()))
       return false;
 

lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp

@@ -28,7 +28,6 @@
 #include "lldb/Target/StackFrame.h"
 #include "lldb/Target/ThreadPlanRunToAddress.h"
 #include "lldb/Target/ThreadPlanStepInRange.h"
-#include "lldb/Utility/RegularExpression.h"
 #include "lldb/Utility/Timer.h"
 
 using namespace lldb;
@@ -41,17 +40,6 @@ char CPPLanguageRuntime::ID = 0;
 CPPLanguageRuntime::CPPLanguageRuntime(Process *process)
     : LanguageRuntime(process) {}
 
-bool CPPLanguageRuntime::ShouldHideVariable(llvm::StringRef name) const {
-  // Matches the global function objects in std::ranges/std::ranges::views
-  // E.g.,
-  //   std::__1::ranges::views::__cpo::take
-  //   std::__1::ranges::__cpo::max_element
-  static RegularExpression ignore_global_ranges_pattern(
-      "std::__[[:alnum:]]+::ranges(::views)*::__cpo");
-
-  return ignore_global_ranges_pattern.Execute(name);
-}
-
 bool CPPLanguageRuntime::IsAllowedRuntimeValue(ConstString name) {
   return name == g_this;
 }

lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h

@@ -77,8 +77,6 @@ class CPPLanguageRuntime : public LanguageRuntime {
   lldb::ThreadPlanSP GetStepThroughTrampolinePlan(Thread &thread,
                                                   bool stop_others) override;
 
-  bool ShouldHideVariable(llvm::StringRef name) const override;
-
   bool IsAllowedRuntimeValue(ConstString name) override;
 protected:
   // Classes that inherit from CPPLanguageRuntime can see and modify these