Migrate debug info emission in code modules to the push model (#3104)

This unifies the debug type info emission code to use the "push"
model for both code and the final "debug" module.

Author: SingleAccretion

src/coreclr/jit/llvm.cpp

@@ -784,16 +784,6 @@ CORINFO_GENERIC_HANDLE Llvm::GetExternalMethodAccessor(
         m_pEECorInfo, methodHandle, sig, sigLength);
 }
 
-CORINFO_LLVM_DEBUG_TYPE_HANDLE Llvm::GetDebugTypeForType(CORINFO_CLASS_HANDLE typeHandle)
-{
-    return CallEEApi<EEAI_GetDebugTypeForType, CORINFO_LLVM_DEBUG_TYPE_HANDLE>(m_pEECorInfo, typeHandle);
-}
-
-void Llvm::GetDebugInfoForDebugType(CORINFO_LLVM_DEBUG_TYPE_HANDLE debugTypeHandle, CORINFO_LLVM_TYPE_DEBUG_INFO* pInfo)
-{
-    CallEEApi<EEAI_GetDebugInfoForDebugType, void>(m_pEECorInfo, debugTypeHandle, pInfo);
-}
-
 void Llvm::GetDebugInfoForCurrentMethod(CORINFO_LLVM_METHOD_DEBUG_INFO* pInfo)
 {
     CallEEApi<EEAI_GetDebugInfoForCurrentMethod, void>(m_pEECorInfo, pInfo);
@@ -841,9 +831,12 @@ void Llvm::GetJitTestInfo(CorInfoLlvmJitTestKind kind, CORINFO_LLVM_JIT_TEST_INF
 }
 
 static SingleThreadedCompilationContext* StartSingleThreadedCompilation(
-    const char* path, const char* triple, const char* dataLayout)
+    CorInfoLlvmSingleThreadedCompilationContextFlags flags,
+    const char* path,
+    const char* triple,
+    const char* dataLayout)
 {
-    SingleThreadedCompilationContext* context = new SingleThreadedCompilationContext(path);
+    SingleThreadedCompilationContext* context = new SingleThreadedCompilationContext(flags, path);
     context->Module.setTargetTriple(triple);
     context->Module.setDataLayout(dataLayout);
 

src/coreclr/jit/llvm.h

@@ -280,19 +280,22 @@ class TypeDebugInfoModule;
 class SingleThreadedCompilationContext
 {
 public:
+    CorInfoLlvmSingleThreadedCompilationContextFlags Flags;
     LLVMContext Context;
     Module Module;
     JitHashTable<CORINFO_CLASS_HANDLE, JitPtrKeyFuncs<CORINFO_CLASS_STRUCT_>, Type*, MallocAllocator> LlvmStructTypesMap = {{}};
     JitHashTable<CORINFO_CLASS_HANDLE, JitPtrKeyFuncs<CORINFO_CLASS_STRUCT_>, StructDesc*, MallocAllocator> StructDescMap = {{}};
-    JitHashTable<CORINFO_LLVM_DEBUG_TYPE_HANDLE, JitSmallPrimitiveKeyFuncs<CORINFO_LLVM_DEBUG_TYPE_HANDLE>, llvm::DIType*, MallocAllocator> DebugTypesMap = {{}};
     TypeDebugInfoModule* DebugTypes = nullptr;
 
-    SingleThreadedCompilationContext(StringRef name) : Module(name, Context)
+    SingleThreadedCompilationContext(CorInfoLlvmSingleThreadedCompilationContextFlags flags, StringRef name)
+        : Flags(flags)
+        , Module(name, Context)
     {
     }
 
     static CORINFO_LLVM_DEBUG_TYPE_HANDLE EmitDebugTypeInfo(SingleThreadedCompilationContext* context, CORINFO_LLVM_TYPE_DEBUG_INFO* pInfo);
     static CORINFO_LLVM_DEBUG_METHOD_DECL_HANDLE EmitDebugMethodDecl(SingleThreadedCompilationContext* context, CORINFO_LLVM_METHOD_DECL_DEBUG_INFO* pInfo);
+    TypeDebugInfoModule* GetDebugTypes();
     void FinishDebugInfo();
 };
 
@@ -422,8 +425,6 @@ class Llvm
     const char* GetAlternativeFunctionName();
     CORINFO_GENERIC_HANDLE GetExternalMethodAccessor(
         CORINFO_METHOD_HANDLE methodHandle, const TargetAbiType* callSiteSig, int sigLength);
-    CORINFO_LLVM_DEBUG_TYPE_HANDLE GetDebugTypeForType(CORINFO_CLASS_HANDLE typeHandle);
-    void GetDebugInfoForDebugType(CORINFO_LLVM_DEBUG_TYPE_HANDLE debugTypeHandle, CORINFO_LLVM_TYPE_DEBUG_INFO* pInfo);
     void GetDebugInfoForCurrentMethod(CORINFO_LLVM_METHOD_DEBUG_INFO* pInfo);
     SingleThreadedCompilationContext* GetSingleThreadedCompilationContext();
     CorInfoLlvmEHModel GetExceptionHandlingModel();
@@ -725,7 +726,6 @@ class Llvm
     // ================================================================================================================
 
     void initializeDebugInfo();
-    void initializeDebugInfoBuilder();
     void initializeDebugVariables(CORINFO_LLVM_METHOD_DEBUG_INFO* pInfo);
 
     void declareDebugVariables();
@@ -735,8 +735,5 @@ class Llvm
     llvm::DILocation* getDebugLocation(unsigned lineNo);
     llvm::DILocation* getArtificialDebugLocation();
     llvm::DILocation* getCurrentOrArtificialDebugLocation();
-
-    llvm::DIType* getOrCreateDebugType(CORINFO_LLVM_DEBUG_TYPE_HANDLE debugTypeHandle);
-    llvm::DIType* createDebugType(CORINFO_LLVM_DEBUG_TYPE_HANDLE debugTypeHandle);
 };
 #endif /* End of _LLVM_H_ */

src/coreclr/jit/llvmcodegen.cpp

@@ -28,7 +28,7 @@ void Llvm::Compile()
 
     if (m_diFunction != nullptr)
     {
-        m_diBuilder->finalize();
+        m_diBuilder->finalizeSubprogram(m_diFunction);
     }
 
     generateAuxiliaryArtifacts();