LLVM: make Context keep a reference to its builders, and make an DIBu…

…ilder keep a reference to its module.
crystal-lang · Feb 19, 2017 · 8926897 · 8926897
1 parent e276338
commit 8926897
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/llvm/builder.cr b/src/llvm/builder.cr
@@ -1,9 +1,6 @@
 class LLVM::Builder
   @disposed = false
 
-  # def initialize(@unwrap : LibLLVM::BuilderRef, @context : Context)
-  # end
-
   def initialize(@unwrap : LibLLVM::BuilderRef)
   end
 
@@ -239,7 +236,7 @@ class LLVM::Builder
     @unwrap
   end
 
-  def finalize
+  protected def dispose
     return if @disposed
     @disposed = true
 

diff --git a/src/llvm/context.cr b/src/llvm/context.cr
@@ -5,6 +5,7 @@ class LLVM::Context
 
   def initialize(@unwrap : LibLLVM::ContextRef, @dispose_on_finalize = true)
     @disposed = false
+    @builders = [] of LLVM::Builder
   end
 
   def new_module(name : String) : Module
@@ -16,8 +17,10 @@ class LLVM::Context
   end
 
   def new_builder : Builder
-    # Builder.new(LibLLVM.create_builder_in_context(self), self)
-    Builder.new(LibLLVM.create_builder_in_context(self))
+    # builder = Builder.new(LibLLVM.create_builder_in_context(self), self)
+    builder = Builder.new(LibLLVM.create_builder_in_context(self))
+    @builders << builder
+    builder
   end
 
   def void : Type
@@ -121,6 +124,8 @@ class LLVM::Context
     return if @disposed
     @disposed = true
 
+    @builders.each &.dispose
+
     LibLLVM.dispose_context(self)
   end
 

diff --git a/src/llvm/di_builder.cr b/src/llvm/di_builder.cr
@@ -1,7 +1,7 @@
 require "./lib_llvm"
 
 struct LLVM::DIBuilder
-  def initialize(llvm_module)
+  def initialize(@llvm_module : Module)
     @unwrap = LibLLVMExt.create_di_builder(llvm_module)
   end