Add LLVM::BasicBlock

parrot · Mar 6, 2011 · d473cea · d473cea
1 parent 9b35f82
commit d473cea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/runtime/parrot/library/LLVM/BasicBlock.pm b/runtime/parrot/library/LLVM/BasicBlock.pm
@@ -0,0 +1,9 @@
+class LLVM::BasicBlock {
+    has $!ref;
+
+    method BUILD($ref) { $!ref := $ref; self };
+
+
+};
+
+# vim: ft=perl6
diff --git a/runtime/parrot/library/LLVM/Function.pm b/runtime/parrot/library/LLVM/Function.pm
@@ -5,7 +5,9 @@ class LLVM::Function {
     method BUILD($ptr) { $!ptr := $ptr; self };
 
     method append_basic_block($name?) {
-        %LLVM::F<LLVMAppendBasicBlock>($!ptr, $name ?? $name !! "block" ~~ $counter++);
+        LLVM::BasicBlock.new.BUILD(
+            %LLVM::F<LLVMAppendBasicBlock>($!ptr, $name ?? $name !! "block" ~~ $counter++)
+        );
     }
 
     method _get_ptr() { $!ptr };

diff --git a/runtime/parrot/library/Rules.mak b/runtime/parrot/library/Rules.mak
@@ -25,6 +25,8 @@ $(LIBRARY_DIR)/P6Object.pbc : \
 $(LIBRARY_DIR)/LLVM.pbc : \
 	$(LIBRARY_DIR)/llvm_lib.pir			\
 	$(LIBRARY_DIR)/LLVM.pir				\
+	$(LIBRARY_DIR)/LLVM/BasicBlock.pir 	\
+	$(LIBRARY_DIR)/LLVM/Builder.pir 	\
 	$(LIBRARY_DIR)/LLVM/Function.pir 	\
 	$(LIBRARY_DIR)/LLVM/Module.pir		\
 	$(LIBRARY_DIR)/LLVM/Type.pir
@@ -33,6 +35,9 @@ $(LIBRARY_DIR)/LLVM.pbc : \
 $(LIBRARY_DIR)/LLVM.pir: $(NQP_RX) $(LIBRARY_DIR)/LLVM.pm
 	$(NQP_RX) --target=pir --output=$@ $(LIBRARY_DIR)/LLVM.pm
 
+$(LIBRARY_DIR)/LLVM/BasicBlock.pir: $(NQP_RX) $(LIBRARY_DIR)/LLVM/BasicBlock.pm
+	$(NQP_RX) --target=pir --output=$@ $(LIBRARY_DIR)/LLVM/BasicBlock.pm
+
 $(LIBRARY_DIR)/LLVM/Builder.pir: $(NQP_RX) $(LIBRARY_DIR)/LLVM/Builder.pm
 	$(NQP_RX) --target=pir --output=$@ $(LIBRARY_DIR)/LLVM/Builder.pm
 

diff --git a/runtime/parrot/library/llvm_lib.pir b/runtime/parrot/library/llvm_lib.pir
@@ -1,5 +1,7 @@
 
 .include "runtime/parrot/library/LLVM.pir"
+.include "runtime/parrot/library/LLVM/BasicBlock.pir"
+.include "runtime/parrot/library/LLVM/Builder.pir"
 .include "runtime/parrot/library/LLVM/Function.pir"
 .include "runtime/parrot/library/LLVM/Type.pir"
 .include "runtime/parrot/library/LLVM/Module.pir"
diff --git a/t/library/llvm.t b/t/library/llvm.t
@@ -19,6 +19,7 @@ ok( $function ~~ LLVM::Function, ".. with proper type");
 
 my $bb := $function.append_basic_block("the_block");
 ok( pir::defined($bb), "BasicBlock appended");
+ok( $bb ~~ LLVM::BasicBlock, ".. with proper type");
 
 # This will dump to stderr.
 $module.dump();