Merge pull request ruby-llvm#38 from ishikawa/passing-int-to-llvm-boo…

…l-param

Convert LLVMBool parameteter/result to Ruby boolean

lib/llvm/core/value.rb

@@ -639,11 +639,16 @@ def initializer=(val)
     end
 
     def global_constant?
-      C.is_global_constant(self)
+      C.is_global_constant(self) != 0
     end
 
     def global_constant=(flag)
-      C.set_global_constant(self, flag)
+      if flag.kind_of?(Integer)
+        warn 'Warning: Passing Integer value to LLVM::GlobalValue#global_constant=(Boolean) is deprecated.'
+        flag = !flag.zero?
+      end
+
+      C.set_global_constant(self, flag ? 1 : 0)
     end
 
     def unnamed_addr?

lib/llvm/transforms/builder.rb

@@ -88,9 +88,14 @@ def build_with_lto(pass_manager, internalize=false, run_inliner=false)
         raise ArgumentError, "FunctionPassManager does not support LTO"
       end
 
-      # Add flag() when the header gets fixed and has LLVMBool
+      if internalize.kind_of?(Integer) || run_inliner.kind_of?(Integer)
+        warn 'Warning: Passing Integer value to LLVM::PassManagerBuilder#build_with_lto is deprecated.'
+        internalize = !internalize.zero? if internalize.kind_of?(Integer)
+        run_inliner = !run_inliner.zero? if run_inliner.kind_of?(Integer)
+      end
+
       C.pass_manager_builder_populate_lto_pass_manager(self,
-            pass_manager, internalize, run_inliner)
+            pass_manager, flag(internalize), flag(run_inliner))
     end
 
     private

test/module_test.rb

@@ -28,9 +28,20 @@ def test_global_variable
 
         assert var.kind_of?(LLVM::GlobalVariable)
 
+        # unnamed_addr
         assert !var.unnamed_addr?
         var.unnamed_addr = true
         assert var.unnamed_addr?
+
+        # global_constant
+        assert !var.global_constant?
+        var.global_constant = true
+        assert var.global_constant?
+
+        assert_output("", "Warning: Passing Integer value to LLVM::GlobalValue#global_constant=(Boolean) is deprecated.\n") do
+          var.global_constant = 0
+        end
+        assert !var.global_constant?
       end
     end
 

test/pass_manager_builder_test.rb

@@ -1,14 +1,19 @@
 require 'test_helper'
+require 'llvm/config'
 require 'llvm/transforms/builder'
 
 class PassManagerBuilderTest < Minitest::Test
   def setup
     LLVM.init_jit
     @builder = LLVM::PassManagerBuilder.new
+
+    machine = LLVM::Target.by_name('x86-64').create_machine('x86-linux-gnu')
+    @pass_manager = LLVM::PassManager.new(machine)
   end
 
   def teardown
     @builder.dispose
+    @pass_manager.dispose
   end
 
   def test_init
@@ -26,8 +31,24 @@ def test_opt_level
   end
 
   def test_build
-    machine = LLVM::Target.by_name('x86-64').create_machine('x86-linux-gnu')
-    pass_manager = LLVM::PassManager.new(machine)
-    @builder.build(pass_manager)
+    @builder.build(@pass_manager)
+  end
+
+  def test_build_with_lto
+    assert_output('', '') do
+      @builder.build_with_lto(@pass_manager)
+    end
+  end
+
+  def test_build_with_lto_deprecated_internalize_param
+    assert_output("", "Warning: Passing Integer value to LLVM::PassManagerBuilder#build_with_lto is deprecated.\n") do
+      @builder.build_with_lto(@pass_manager, 0)
+    end
+  end
+
+  def test_build_with_lto_deprecated_run_inliner_param
+    assert_output("", "Warning: Passing Integer value to LLVM::PassManagerBuilder#build_with_lto is deprecated.\n") do
+      @builder.build_with_lto(@pass_manager, false, 0)
+    end
   end
 end