summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEwan Crawford <ewan@codeplay.com>2016-02-03 09:17:03 +0000
committerEwan Crawford <ewan@codeplay.com>2016-02-03 09:17:03 +0000
commit75f0ff5ba1826e157f8da6756f644560586e5637 (patch)
treeb06bf70c02be5e6990d343d6283f2bc583e67699
parentf4a97d0772c4db124f7b3b498cef206712c1fe73 (diff)
downloadbcm5719-llvm-75f0ff5ba1826e157f8da6756f644560586e5637.tar.gz
bcm5719-llvm-75f0ff5ba1826e157f8da6756f644560586e5637.zip
[RenderScript] Use LLVM DWARF language enum
A DWARF language vender extension for RenderScript was added to LLVM in r259348(http://reviews.llvm.org/D16409) We should use this generated enum instead of the hardcoded value. RenderScript is also based on C99 with some extensions, so we want to use ClangASTContext when RS is detected. Reviewers: clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D16766 llvm-svn: 259634
-rw-r--r--lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp2
-rw-r--r--lldb/source/Symbol/ClangASTContext.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
index e7cb2b413ad..35d0be706d1 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
@@ -1180,7 +1180,7 @@ DWARFCompileUnit::LanguageTypeFromDWARF(uint64_t val)
{
case DW_LANG_Mips_Assembler:
return eLanguageTypeMipsAssembler;
- case 0x8e57: // FIXME: needs to be added to llvm
+ case DW_LANG_GOOGLE_RenderScript:
return eLanguageTypeExtRenderScript;
default:
return static_cast<LanguageType>(val);
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 2086ca77bff..0fc1a94876b 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -105,7 +105,8 @@ namespace
return language == eLanguageTypeUnknown || // Clang is the default type system
Language::LanguageIsC (language) ||
Language::LanguageIsCPlusPlus (language) ||
- Language::LanguageIsObjC (language);
+ Language::LanguageIsObjC (language) ||
+ language == eLanguageTypeExtRenderScript;
}
}
OpenPOWER on IntegriCloud