fixup! create literal AsmLabels

Author: Michael137

lldb/include/lldb/Expression/Expression.h

@@ -118,9 +118,6 @@ struct FunctionCallLabel {
 /// from JITted expressions.
 inline constexpr llvm::StringRef FunctionCallLabelPrefix = "$__lldb_func";
 
-bool consumeFunctionCallLabelPrefix(llvm::StringRef &name);
-bool hasFunctionCallLabelPrefix(llvm::StringRef name);
-
 } // namespace lldb_private
 
 #endif // LLDB_EXPRESSION_EXPRESSION_H

lldb/source/Expression/Expression.cpp

@@ -30,15 +30,3 @@ Expression::Expression(ExecutionContextScope &exe_scope)
       m_jit_end_addr(LLDB_INVALID_ADDRESS) {
   assert(m_target_wp.lock());
 }
-
-bool lldb_private::consumeFunctionCallLabelPrefix(llvm::StringRef &name) {
-  // On Darwin mangled names get a '_' prefix.
-  name.consume_front("_");
-  return name.consume_front(FunctionCallLabelPrefix);
-}
-
-bool lldb_private::hasFunctionCallLabelPrefix(llvm::StringRef name) {
-  // On Darwin mangled names get a '_' prefix.
-  name.consume_front("_");
-  return name.starts_with(FunctionCallLabelPrefix);
-}

lldb/source/Expression/IRExecutionUnit.cpp

@@ -966,7 +966,7 @@ lldb::addr_t IRExecutionUnit::FindInUserDefinedSymbols(
 
 lldb::addr_t IRExecutionUnit::FindSymbol(lldb_private::ConstString name,
                                          bool &missing_weak) {
-  if (hasFunctionCallLabelPrefix(name.GetStringRef())) {
+  if (name.GetStringRef().starts_with(FunctionCallLabelPrefix)) {
     if (auto addr_or_err = ResolveFunctionCallLabel(name.GetStringRef(),
                                                     m_sym_ctx, missing_weak)) {
       return *addr_or_err;

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

@@ -2173,7 +2173,7 @@ FunctionDecl *TypeSystemClang::CreateFunctionDeclaration(
   // AddMethodToCXXRecordType.
   if (asm_label)
     func_decl->addAttr(clang::AsmLabelAttr::CreateImplicit(ast, *asm_label,
-                                                           /*literal=*/false));
+                                                           /*literal=*/true));
 
   SetOwningModule(func_decl, owning_module);
   decl_ctx->addDecl(func_decl);
@@ -7799,7 +7799,7 @@ clang::CXXMethodDecl *TypeSystemClang::AddMethodToCXXRecordType(
 
   if (asm_label)
     cxx_method_decl->addAttr(clang::AsmLabelAttr::CreateImplicit(
-        getASTContext(), *asm_label, /*literal=*/false));
+        getASTContext(), *asm_label, /*literal=*/true));
 
   // Parameters on member function declarations in DWARF generally don't
   // have names, so we omit them when creating the ParmVarDecls.
@@ -9787,7 +9787,7 @@ void TypeSystemClang::LogCreation() const {
 // $__lldb_func:<mangled name>:<module id>:<definition/declaration DIE id>
 llvm::Expected<llvm::SmallVector<llvm::StringRef, 3>>
 TypeSystemClang::splitFunctionCallLabel(llvm::StringRef label) const {
-  if (!consumeFunctionCallLabelPrefix(label))
+  if (!label.consume_front(FunctionCallLabelPrefix))
     return llvm::createStringError(
         "expected function call label prefix not found in %s", label.data());
   if (!label.consume_front(":"))