[Lldb-commits] [lldb] 017d7a9 - Rename human-readable name for DW_LANG_Mips_Assembler

[Adrian Prantl via lldb-commits]

Author: Adrian Prantl
Date: 2021-05-12T19:13:58-07:00
New Revision: 017d7a9e14245e549999c5e3b8bd7398fcf79410

URL: https://github.com/llvm/llvm-project/commit/017d7a9e14245e549999c5e3b8bd7398fcf79410
DIFF: https://github.com/llvm/llvm-project/commit/017d7a9e14245e549999c5e3b8bd7398fcf79410.diff

LOG: Rename human-readable name for DW_LANG_Mips_Assembler

The Mips in DW_LANG_Mips_Assembler is a vendor name not an
architecture name and in lack of a proper generic DW_LANG_assembler,
some assemblers emit DWARF using this tag. Due to a warning I recently
introduced users will now be greeted with

  This version of LLDB has no plugin for the mipsassem language. Inspection of frame variables will be limited.

By renaming this to just "Assembler" this error message will make more sense.

Differential Revision: https://reviews.llvm.org/D101406

rdar://77214764

Added: 
    

Modified: 
    lldb/source/Target/Language.cpp
    lldb/source/Target/Process.cpp
    lldb/test/Shell/Process/UnsupportedLanguage.test

Removed: 
    


################################################################################
diff  --git a/lldb/source/Target/Language.cpp b/lldb/source/Target/Language.cpp
index b1a8a9517f3f..a6010b7a31f1 100644
--- a/lldb/source/Target/Language.cpp
+++ b/lldb/source/Target/Language.cpp
@@ -184,7 +184,7 @@ struct language_name_pair language_names[] = {
     {"fortran03", eLanguageTypeFortran03},
     {"fortran08", eLanguageTypeFortran08},
     // Vendor Extensions
-    {"mipsassem", eLanguageTypeMipsAssembler},
+    {"assembler", eLanguageTypeMipsAssembler},
     {"renderscript", eLanguageTypeExtRenderScript},
     // Now synonyms, in arbitrary order
     {"objc", eLanguageTypeObjC},

diff  --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index baa48b3408d4..514a8f7dbbca 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -5741,7 +5741,7 @@ void Process::PrintWarningUnsupportedLanguage(const SymbolContext &sc) {
   if (!plugins[language]) {
     PrintWarning(Process::Warnings::eWarningsUnsupportedLanguage,
                  sc.module_sp.get(),
-                 "This version of LLDB has no plugin for the %s language. "
+                 "This version of LLDB has no plugin for the language \"%s\". "
                  "Inspection of frame variables will be limited.\n",
                  Language::GetNameForLanguageType(language));
   }

diff  --git a/lldb/test/Shell/Process/UnsupportedLanguage.test b/lldb/test/Shell/Process/UnsupportedLanguage.test
index 28726abd6a1e..56d53e9dbe57 100644
--- a/lldb/test/Shell/Process/UnsupportedLanguage.test
+++ b/lldb/test/Shell/Process/UnsupportedLanguage.test
@@ -1,8 +1,8 @@
 Test warnings.
 REQUIRES: shell
 RUN: %clang_host %S/Inputs/true.c -std=c99 -g -c -S -emit-llvm -o - \
-RUN:   | sed -e 's/DW_LANG_C99/DW_LANG_PLI/g' >%t.ll
+RUN:   | sed -e 's/DW_LANG_C99/DW_LANG_Mips_Assembler/g' >%t.ll
 RUN: %clang_host %t.ll -g -o %t.exe
 RUN: %lldb -o "b main" -o r -o q -b %t.exe | FileCheck %s
 
-CHECK: This version of LLDB has no plugin for the pli language
+CHECK: This version of LLDB has no plugin for the language "assembler"