Move somewhat messy conditional out of line.
No functional change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187843 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 1b9105d..859805c 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -1092,6 +1092,14 @@
return false;
}
+/// Test if the current CU language is C++ and that we have
+/// a named type that is not contained in an anonymous namespace.
+static bool shouldAddODRHash(CompileUnit *CU, DIE *Die) {
+ return (CU->getLanguage() == dwarf::DW_LANG_C_plus_plus &&
+ getDIEStringAttr(Die, dwarf::DW_AT_name) != "" &&
+ !isContainedInAnonNamespace(Die));
+}
+
void DwarfDebug::finalizeModuleInfo() {
// Collect info for variables that were optimized out.
collectDeadVariables();
@@ -1113,13 +1121,9 @@
for (unsigned i = 0, e = TypeUnits.size(); i != e; ++i) {
MD5 Hash;
DIE *Die = TypeUnits[i];
- // If we've requested ODR hashes, the current language is C++, the type is
- // named, and the type isn't located inside a C++ anonymous namespace then
- // add the ODR signature attribute now.
- if (GenerateODRHash &&
- CUMap.begin()->second->getLanguage() == dwarf::DW_LANG_C_plus_plus &&
- (getDIEStringAttr(Die, dwarf::DW_AT_name) != "") &&
- !isContainedInAnonNamespace(Die))
+ // If we've requested ODR hashes and it's applicable for an ODR hash then
+ // add the ODR signature now.
+ if (GenerateODRHash && shouldAddODRHash(CUMap.begin()->second, Die))
addDIEODRSignature(Hash, CUMap.begin()->second, Die);
}