Add additional DWARF 5 language constants.

This also hooks up the new C++14 language constant to be treated the same as the other C++ language constants. Differential Revision: http://reviews.llvm.org/D7429 llvm-svn: 228386
llvm · Feb 6, 2015 · 2ba84a6 · 2ba84a6
1 parent d193763
commit 2ba84a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h
@@ -378,6 +378,8 @@ namespace lldb {
         eLanguageTypeUPC             = 0x0012,   ///< Unified Parallel C.
         eLanguageTypeD               = 0x0013,   ///< D.
         eLanguageTypePython          = 0x0014,   ///< Python.
+        // NOTE: The below are DWARF5 constants, subject to change upon
+        // completion of the DWARF5 specification
         eLanguageTypeOpenCL          = 0x0015,   ///< OpenCL.
         eLanguageTypeGo              = 0x0016,   ///< Go.
         eLanguageTypeModula3         = 0x0017,   ///< Modula 3.
@@ -390,6 +392,9 @@ namespace lldb {
         eLanguageTypeSwift           = 0x001e,   ///< Swift.
         eLanguageTypeJulia           = 0x001f,   ///< Julia.
         eLanguageTypeDylan           = 0x0020,   ///< Dylan.
+        eLanguageTypeC_plus_plus_14  = 0x0021,   ///< ISO C++:2014.
+        eLanguageTypeFortran03       = 0x0022,   ///< ISO Fortran 2003.
+        eLanguageTypeFortran08       = 0x0023,   ///< ISO Fortran 2008.
         eNumLanguageTypes
     } LanguageType;
 

diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp
@@ -167,6 +167,7 @@ class CommandObjectBreakpointSet : public CommandObjectParsed
                         case eLanguageTypeC_plus_plus:
                         case eLanguageTypeC_plus_plus_03:
                         case eLanguageTypeC_plus_plus_11:
+                        case eLanguageTypeC_plus_plus_14:
                             m_language = eLanguageTypeC_plus_plus;
                             break;
                         case eLanguageTypeObjC:

diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@@ -291,7 +291,8 @@ ItaniumABILanguageRuntime::CreateInstance (Process *process, lldb::LanguageType
     // the Itanium ABI.
     if (language == eLanguageTypeC_plus_plus ||
         language == eLanguageTypeC_plus_plus_03 ||
-        language == eLanguageTypeC_plus_plus_11)
+        language == eLanguageTypeC_plus_plus_11 ||
+        language == eLanguageTypeC_plus_plus_14)
         return new ItaniumABILanguageRuntime (process);
     else
         return NULL;

diff --git a/lldb/source/Target/LanguageRuntime.cpp b/lldb/source/Target/LanguageRuntime.cpp
@@ -337,6 +337,9 @@ struct language_name_pair language_names[] =
     {   "swift",            eLanguageTypeSwift          },
     {   "julia",            eLanguageTypeJulia          },
     {   "dylan",            eLanguageTypeDylan          },
+    {   "c++14",            eLanguageTypeC_plus_plus_14 },
+    {   "fortran03",        eLanguageTypeFortran03      },
+    {   "fortran08",        eLanguageTypeFortran08      },
     // Now synonyms, in arbitrary order
     {   "objc",             eLanguageTypeObjC           },
     {   "objc++",           eLanguageTypeObjC_plus_plus }