Michael137 created this revision.
Michael137 added reviewers: aprantl, labath.
Herald added a project: All.
Michael137 requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
Adds more languages to the `language_names` list in
preparation for adding support for C++20 expression
evaluation.
The language constants were taken from the DWARFv5
constants defined in LLVM's `Dwarf.def`. Two vendor
constants overlap with the DWARFv5 constants so bump
their values. Their actual value is not important,
whereas keeping the enum values consecutive is (since
they are used for array lookups).
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D143061
Files:
lldb/include/lldb/lldb-enumerations.h
lldb/source/Target/Language.cpp
Index: lldb/source/Target/Language.cpp
===================================================================
--- lldb/source/Target/Language.cpp
+++ lldb/source/Target/Language.cpp
@@ -194,9 +194,24 @@
{"c++14", eLanguageTypeC_plus_plus_14},
{"fortran03", eLanguageTypeFortran03},
{"fortran08", eLanguageTypeFortran08},
+ {"renderscript", eLanguageTypeRenderScript},
+ {"bliss", eLanguageTypeBLISS},
+ {"kotlin", eLanguageTypeKotlin},
+ {"zig", eLanguageTypeZig},
+ {"crystal", eLanguageTypeCrystal},
+ {"<invalid language>",
+ static_cast<LanguageType>(
+ 0x0029)}, // Not yet taken by any language in the DWARF spec
+ // and thus has no entry in LanguageType
+ {"c++17", eLanguageTypeC_plus_plus_17},
+ {"c++20", eLanguageTypeC_plus_plus_20},
+ {"c17", eLanguageTypeC17},
+ {"fortran18", eLanguageTypeFortran18},
+ {"ada2005", eLanguageTypeAda2005},
+ {"ada2012", eLanguageTypeAda2012},
// Vendor Extensions
{"assembler", eLanguageTypeMipsAssembler},
- {"renderscript", eLanguageTypeExtRenderScript},
+ {"google_renderscript", eLanguageTypeExtRenderScript},
// Now synonyms, in arbitrary order
{"objc", eLanguageTypeObjC},
{"objc++", eLanguageTypeObjC_plus_plus},
Index: lldb/include/lldb/lldb-enumerations.h
===================================================================
--- lldb/include/lldb/lldb-enumerations.h
+++ lldb/include/lldb/lldb-enumerations.h
@@ -479,13 +479,26 @@
eLanguageTypeC_plus_plus_14 = 0x0021, ///< ISO C++:2014.
eLanguageTypeFortran03 = 0x0022, ///< ISO Fortran 2003.
eLanguageTypeFortran08 = 0x0023, ///< ISO Fortran 2008.
+ eLanguageTypeRenderScript = 0x0024,
+ eLanguageTypeBLISS = 0x0025,
+ eLanguageTypeKotlin = 0x0026,
+ eLanguageTypeZig = 0x0027,
+ eLanguageTypeCrystal = 0x0028,
+ eLanguageTypeC_plus_plus_17 = 0x002a, ///< ISO C++:2017.
+ eLanguageTypeC_plus_plus_20 = 0x002b, ///< ISO C++:2020.
+ eLanguageTypeC17 = 0x002c,
+ eLanguageTypeFortran18 = 0x002d,
+ eLanguageTypeAda2005 = 0x002e,
+ eLanguageTypeAda2012 = 0x002f,
+
// Vendor Extensions
// Note: Language::GetNameForLanguageType
// assumes these can be used as indexes into array language_names, and
// Language::SetLanguageFromCString and Language::AsCString assume these can
// be used as indexes into array g_languages.
- eLanguageTypeMipsAssembler = 0x0024, ///< Mips_Assembler.
- eLanguageTypeExtRenderScript = 0x0025, ///< RenderScript.
+ eLanguageTypeMipsAssembler, ///< Mips_Assembler.
+ eLanguageTypeExtRenderScript, ///< GOOGLE_RenderScript.
+
eNumLanguageTypes
};
Index: lldb/source/Target/Language.cpp
===================================================================
--- lldb/source/Target/Language.cpp
+++ lldb/source/Target/Language.cpp
@@ -194,9 +194,24 @@
{"c++14", eLanguageTypeC_plus_plus_14},
{"fortran03", eLanguageTypeFortran03},
{"fortran08", eLanguageTypeFortran08},
+ {"renderscript", eLanguageTypeRenderScript},
+ {"bliss", eLanguageTypeBLISS},
+ {"kotlin", eLanguageTypeKotlin},
+ {"zig", eLanguageTypeZig},
+ {"crystal", eLanguageTypeCrystal},
+ {"<invalid language>",
+ static_cast<LanguageType>(
+ 0x0029)}, // Not yet taken by any language in the DWARF spec
+ // and thus has no entry in LanguageType
+ {"c++17", eLanguageTypeC_plus_plus_17},
+ {"c++20", eLanguageTypeC_plus_plus_20},
+ {"c17", eLanguageTypeC17},
+ {"fortran18", eLanguageTypeFortran18},
+ {"ada2005", eLanguageTypeAda2005},
+ {"ada2012", eLanguageTypeAda2012},
// Vendor Extensions
{"assembler", eLanguageTypeMipsAssembler},
- {"renderscript", eLanguageTypeExtRenderScript},
+ {"google_renderscript", eLanguageTypeExtRenderScript},
// Now synonyms, in arbitrary order
{"objc", eLanguageTypeObjC},
{"objc++", eLanguageTypeObjC_plus_plus},
Index: lldb/include/lldb/lldb-enumerations.h
===================================================================
--- lldb/include/lldb/lldb-enumerations.h
+++ lldb/include/lldb/lldb-enumerations.h
@@ -479,13 +479,26 @@
eLanguageTypeC_plus_plus_14 = 0x0021, ///< ISO C++:2014.
eLanguageTypeFortran03 = 0x0022, ///< ISO Fortran 2003.
eLanguageTypeFortran08 = 0x0023, ///< ISO Fortran 2008.
+ eLanguageTypeRenderScript = 0x0024,
+ eLanguageTypeBLISS = 0x0025,
+ eLanguageTypeKotlin = 0x0026,
+ eLanguageTypeZig = 0x0027,
+ eLanguageTypeCrystal = 0x0028,
+ eLanguageTypeC_plus_plus_17 = 0x002a, ///< ISO C++:2017.
+ eLanguageTypeC_plus_plus_20 = 0x002b, ///< ISO C++:2020.
+ eLanguageTypeC17 = 0x002c,
+ eLanguageTypeFortran18 = 0x002d,
+ eLanguageTypeAda2005 = 0x002e,
+ eLanguageTypeAda2012 = 0x002f,
+
// Vendor Extensions
// Note: Language::GetNameForLanguageType
// assumes these can be used as indexes into array language_names, and
// Language::SetLanguageFromCString and Language::AsCString assume these can
// be used as indexes into array g_languages.
- eLanguageTypeMipsAssembler = 0x0024, ///< Mips_Assembler.
- eLanguageTypeExtRenderScript = 0x0025, ///< RenderScript.
+ eLanguageTypeMipsAssembler, ///< Mips_Assembler.
+ eLanguageTypeExtRenderScript, ///< GOOGLE_RenderScript.
+
eNumLanguageTypes
};
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
