Merge commit 'ab4e7aeea216' from swift/release/6.0 into stable/20230725

Author: git apple-llvm automerger

lldb/source/Plugins/ExpressionParser/Clang/ClangPersistentVariables.cpp

@@ -53,36 +53,26 @@ void ClangPersistentVariables::RemovePersistentVariable(
 
   RemoveVariable(variable);
 
-  const char *name = variable->GetName().AsCString();
+  // Check if the removed variable was the last one that was created. If yes,
+  // reuse the variable id for the next variable.
 
-  if (*name != '$')
+  // Nothing to do if we have not assigned a variable id so far.
+  if (m_next_persistent_variable_id == 0)
     return;
-  name++;
-
-  bool is_error = false;
-
-  if (variable->GetCompilerType().GetTypeSystem()->SupportsLanguage(
-          lldb::eLanguageTypeSwift)) {
-    switch (*name) {
-    case 'R':
-      break;
-    case 'E':
-      is_error = true;
-      break;
-    default:
-      return;
-    }
-    name++;
-  }
 
-  uint32_t value = strtoul(name, nullptr, 0);
-  if (is_error) {
-    if (value == m_next_persistent_error_id - 1)
-      m_next_persistent_error_id--;
-  } else {
-    if (value == m_next_persistent_variable_id - 1)
-      m_next_persistent_variable_id--;
-  }
+  llvm::StringRef name = variable->GetName().GetStringRef();
+  // Remove the prefix from the variable that only the indes is left.
+  if (!name.consume_front(GetPersistentVariablePrefix(false)))
+    return;
+
+  // Check if the variable contained a variable id.
+  uint32_t variable_id;
+  if (name.getAsInteger(10, variable_id))
+    return;
+  // If it's the most recent variable id that was assigned, make sure that this
+  // variable id will be used for the next persistent variable.
+  if (variable_id == m_next_persistent_variable_id - 1)
+    m_next_persistent_variable_id--;
 }
 
 std::optional<CompilerType>

lldb/source/Plugins/ExpressionParser/Clang/ClangPersistentVariables.h

@@ -120,8 +120,6 @@ class ClangPersistentVariables
   uint32_t m_next_user_file_id = 0;
   // The counter used by GetNextPersistentVariableName
   uint32_t m_next_persistent_variable_id = 0;
-  /// The counter used by GetNextResultName when is_error is true.
-  uint32_t m_next_persistent_error_id;
 
   typedef llvm::DenseMap<const char *, clang::TypeDecl *>
       ClangPersistentTypeMap;