From: Adrian Prantl <aprantl@apple.com>
Date: Sat, 19 Sep 2015 00:59:22 +0000 (+0000)
Subject: Further simplify CGDebugInfo::getOrCreateModuleRef().
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e767ddcc6765f4b5672addbbeb64ce04c92498b;p=clang

Further simplify CGDebugInfo::getOrCreateModuleRef().
DIBuilder ignoers DICompileUnits that are passed in as scopes anyway.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@248077 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 2743c3f28e..c0a3db4d61 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -1702,19 +1702,17 @@ CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod,
     }
   }
 
-  llvm::DIModule *M = nullptr;
   if (CreateSkeletonCU) {
     llvm::DIBuilder DIB(CGM.getModule());
-    auto *CU = DIB.createCompileUnit(
-        TheCU->getSourceLanguage(), Mod.FullModuleName, Mod.Path,
-        TheCU->getProducer(), true, StringRef(), 0, Mod.ASTFile,
-        llvm::DIBuilder::FullDebug, Mod.Signature);
-    M = DIB.createModule(CU, Mod.FullModuleName, ConfigMacros, Mod.Path,
-                         CGM.getHeaderSearchOpts().Sysroot);
+    DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.FullModuleName,
+                          Mod.Path, TheCU->getProducer(), true, StringRef(), 0,
+                          Mod.ASTFile, llvm::DIBuilder::FullDebug,
+                          Mod.Signature);
     DIB.finalize();
-  } else
-    M = DBuilder.createModule(TheCU, Mod.FullModuleName, ConfigMacros, Mod.Path,
-                              CGM.getHeaderSearchOpts().Sysroot);
+  }
+  llvm::DIModule *M =
+      DBuilder.createModule(TheCU, Mod.FullModuleName, ConfigMacros, Mod.Path,
+                            CGM.getHeaderSearchOpts().Sysroot);
   ModRef.reset(M);
   return M;
 }