Use smart pointer for context to get automatic de-allocation.

Signed-off-by: Julian Oppermann <[email protected]>

Author: jopperm

sycl-jit/jit-compiler/lib/KernelFusion.cpp

@@ -244,27 +244,21 @@ extern "C" JITResult compileSYCL(InMemoryFile SourceFile,
     return errorToFusionResult(ModuleOrErr.takeError(),
                                "Device compilation failed");
   }
-  std::unique_ptr<llvm::Module> Module = std::move(*ModuleOrErr);
 
-  auto FreeModuleAndContext = [&Module]() {
-    auto *LLVMCtx = &Module->getContext();
-    Module.reset();
-    delete LLVMCtx;
-  };
+  std::unique_ptr<llvm::LLVMContext> Context;
+  std::unique_ptr<llvm::Module> Module = std::move(*ModuleOrErr);
+  Context.reset(&Module->getContext());
 
-  if (auto Error = linkDefaultDeviceLibraries(Module.get(), UserArgs)) {
-    FreeModuleAndContext();
+  if (auto Error = linkDefaultDeviceLibraries(*Module, UserArgs)) {
     return errorToFusionResult(std::move(Error), "Device linking failed");
   }
 
   SYCLKernelInfo Kernel;
   if (auto Error = translation::KernelTranslator::translateKernel(
           Kernel, *Module, JITContext::getInstance(), BinaryFormat::SPIRV)) {
-    FreeModuleAndContext();
     return errorToFusionResult(std::move(Error), "SPIR-V translation failed");
   }
 
-  FreeModuleAndContext();
   return JITResult{Kernel};
 }
 

sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.cpp

@@ -150,7 +150,7 @@ jit_compiler::compileDeviceCode(InMemoryFile SourceFile,
   return createStringError("Unable to obtain LLVM module");
 }
 
-Error jit_compiler::linkDefaultDeviceLibraries(llvm::Module *Module,
+Error jit_compiler::linkDefaultDeviceLibraries(llvm::Module &Module,
                                                View<const char *> UserArgs) {
   // This function mimics the device library selection process
   // `clang::driver::tools::SYCL::getDeviceLibraries`, assuming a SPIR-V target
@@ -195,22 +195,21 @@ Error jit_compiler::linkDefaultDeviceLibraries(llvm::Module *Module,
       "libsycl-itt-user-wrappers", "libsycl-itt-compiler-wrappers",
       "libsycl-itt-stubs"};
 
-  LLVMContext &Ctx = Module->getContext();
+  LLVMContext &Context = Module.getContext();
   auto Link = [&](ArrayRef<llvm::StringLiteral> LibNames) -> Error {
     for (const auto &LibName : LibNames) {
       std::string LibPath = (DPCPPRoot + "/lib/" + LibName + ".bc").str();
 
       SMDiagnostic Diag;
-      std::unique_ptr<llvm::Module> Lib = parseIRFile(LibPath, Diag, Ctx);
+      std::unique_ptr<llvm::Module> Lib = parseIRFile(LibPath, Diag, Context);
       if (!Lib) {
         std::string DiagMsg;
         raw_string_ostream SOS(DiagMsg);
         Diag.print(/*ProgName=*/nullptr, SOS);
         return createStringError(DiagMsg);
       }
 
-      if (Linker::linkModules(*Module, std::move(Lib),
-                              Linker::LinkOnlyNeeded)) {
+      if (Linker::linkModules(Module, std::move(Lib), Linker::LinkOnlyNeeded)) {
         // TODO: `linkModules` always prints errors to the console.
         return createStringError("Unable to link device library: %s",
                                  LibPath.c_str());

sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.h

@@ -23,7 +23,7 @@ llvm::Expected<std::unique_ptr<llvm::Module>>
 compileDeviceCode(InMemoryFile SourceFile, View<InMemoryFile> IncludeFiles,
                   View<const char *> UserArgs);
 
-llvm::Error linkDefaultDeviceLibraries(llvm::Module *Module,
+llvm::Error linkDefaultDeviceLibraries(llvm::Module &Module,
                                        View<const char *> UserArgs);
 
 } // namespace jit_compiler