Merge pull request #340 from maleadt/tb/irbuilder

Refactor in anticipation of breaking release

Author: maleadt

deps/LLVMExtra/include/LLVMExtra.h

@@ -158,6 +158,10 @@ LLVMValueRef LLVMBuildCallWithOpBundle(LLVMBuilderRef B, LLVMValueRef Fn,
                                        LLVMValueRef *Args, unsigned NumArgs,
                                        LLVMOperandBundleDefRef *Bundles, unsigned NumBundles,
                                        const char *Name);
+LLVMValueRef LLVMBuildCallWithOpBundle2(LLVMBuilderRef B, LLVMTypeRef Ty, LLVMValueRef Fn,
+                                        LLVMValueRef *Args, unsigned NumArgs,
+                                        LLVMOperandBundleDefRef *Bundles, unsigned NumBundles,
+                                        const char *Name);
 LLVMValueRef LLVMMetadataAsValue2(LLVMContextRef C, LLVMMetadataRef Metadata);
 void LLVMReplaceAllMetadataUsesWith(LLVMValueRef Old, LLVMValueRef New);
 void LLVMReplaceMDNodeOperandWith(LLVMMetadataRef MD, unsigned I, LLVMMetadataRef New);

deps/LLVMExtra/lib/llvm-api.cpp

@@ -525,11 +525,28 @@ LLVMValueRef LLVMBuildCallWithOpBundle(LLVMBuilderRef B, LLVMValueRef Fn,
     llvm::IRBuilder<> *Builder = unwrap(B);
     llvm::ArrayRef<llvm::Value*> args = makeArrayRef(unwrap(Args), NumArgs);
 
-    FunctionType *FnT = unwrap<Function>(Fn)->getFunctionType();
+    Value *V = unwrap(Fn);
+    FunctionType *FnT = cast<FunctionType>(V->getType()->getPointerElementType());
     llvm::CallInst *CI = Builder->CreateCall(FnT, unwrap(Fn), args ,BundleArray, Name);
     return wrap(CI);
 }
 
+LLVMValueRef LLVMBuildCallWithOpBundle2(LLVMBuilderRef B, LLVMTypeRef Ty, LLVMValueRef Fn,
+                                        LLVMValueRef *Args, unsigned NumArgs,
+                                        LLVMOperandBundleDefRef *Bundles, unsigned NumBundles,
+                                        const char *Name) {
+    SmallVector<OperandBundleDef, 1> BundleArray;
+    for (auto *Bundle : makeArrayRef(Bundles, NumBundles))
+        BundleArray.push_back(*unwrap<OperandBundleDef>(Bundle));
+
+    llvm::IRBuilder<> *Builder = unwrap(B);
+    llvm::ArrayRef<llvm::Value*> args = makeArrayRef(unwrap(Args), NumArgs);
+
+    FunctionType *FTy = unwrap<FunctionType>(Ty);
+    llvm::CallInst *CI = Builder->CreateCall(FTy, unwrap(Fn), args ,BundleArray, Name);
+    return wrap(CI);
+}
+
 LLVMValueRef LLVMMetadataAsValue2(LLVMContextRef C, LLVMMetadataRef Metadata) {
   auto *MD = unwrap(Metadata);
   if (auto *VAM = dyn_cast<ValueAsMetadata>(MD))

examples/Kaleidoscope/codegen.jl

@@ -1,13 +1,13 @@
 mutable struct CodeGen
     ctx::LLVM.Context
-    builder::LLVM.Builder
+    builder::LLVM.IRBuilder
     current_scope::CurrentScope
     mod::LLVM.Module
 
     CodeGen(ctx::LLVM.Context) =
         new(
             ctx,
-            LLVM.Builder(ctx),
+            LLVM.IRBuilder(ctx),
             CurrentScope(),
             LLVM.Module("KaleidoscopeModule"; ctx),
         )
@@ -23,7 +23,7 @@ Base.show(io::IO, cg::CodeGen) = print(io, "CodeGen")
 
 function create_entry_block_allocation(cg::CodeGen, fn::LLVM.Function, varname::String)
     local alloc
-    LLVM.@dispose builder=LLVM.Builder(cg.ctx) begin
+    LLVM.@dispose builder=LLVM.IRBuilder(cg.ctx) begin
         # Set the builder at the start of the function
         entry_block = LLVM.entry(fn)
         if isempty(LLVM.instructions(entry_block))

examples/constrained.jl

@@ -45,7 +45,7 @@ meta(::Type{FPExceptStrict}) = "fpexcept.strict"
         intrinsic_fun = LLVM.Function(mod, intrinsic, [typ])
         ftype = LLVM.FunctionType(intrinsic,[typ])
         # generate IR
-        @dispose builder=Builder(ctx) begin
+        @dispose builder=IRBuilder(ctx) begin
             entry = BasicBlock(llvm_f, "entry"; ctx)
             position!(builder, entry)
             val = call!(builder, ftype, intrinsic_fun,

examples/generated.jl

@@ -21,7 +21,7 @@ end
         llvmf, _ = create_function(eltyp, paramtyps)
 
         # generate IR
-        @dispose builder=Builder(ctx) begin
+        @dispose builder=IRBuilder(ctx) begin
             entry = BasicBlock(llvmf, "entry"; ctx)
             position!(builder, entry)
 

examples/sum.jl

@@ -21,7 +21,7 @@ end
     sum = LLVM.Function(mod, "sum", fun_type)
 
     # generate IR
-    @dispose builder=Builder(ctx) begin
+    @dispose builder=IRBuilder(ctx) begin
         entry = BasicBlock(sum, "entry"; ctx)
         position!(builder, entry)
 

examples/sum_integrated.jl

@@ -18,7 +18,7 @@ end
     sum, _ = create_function(ret_type, param_types)
 
     # generate IR
-    @dispose builder=Builder(ctx) begin
+    @dispose builder=IRBuilder(ctx) begin
         entry = BasicBlock(sum, "entry"; ctx)
         position!(builder, entry)
 

examples/sum_orc.jl

@@ -22,7 +22,7 @@ function codegen!(mod::LLVM.Module, name, tm)
     sum = LLVM.Function(mod, name, ft)
 
     # generate IR
-    @dispose builder=Builder(ctx) begin
+    @dispose builder=IRBuilder(ctx) begin
         entry = BasicBlock(sum, "entry"; ctx)
         position!(builder, entry)
 

lib/libLLVM_extra.jl

@@ -399,6 +399,10 @@ function LLVMBuildCallWithOpBundle(B, Fn, Args, NumArgs, Bundles, NumBundles, Na
     ccall((:LLVMBuildCallWithOpBundle, libLLVMExtra), LLVMValueRef, (LLVMBuilderRef, LLVMValueRef, Ptr{LLVMValueRef}, Cuint, Ptr{LLVMOperandBundleDefRef}, Cuint, Cstring), B, Fn, Args, NumArgs, Bundles, NumBundles, Name)
 end
 
+function LLVMBuildCallWithOpBundle2(B, Ty, Fn, Args, NumArgs, Bundles, NumBundles, Name)
+    ccall((:LLVMBuildCallWithOpBundle2, libLLVMExtra), LLVMValueRef, (LLVMBuilderRef, LLVMTypeRef, LLVMValueRef, Ptr{LLVMValueRef}, Cuint, Ptr{LLVMOperandBundleDefRef}, Cuint, Cstring), B, Ty, Fn, Args, NumArgs, Bundles, NumBundles, Name)
+end
+
 function LLVMMetadataAsValue2(C, MD)
     ccall((:LLVMMetadataAsValue2, libLLVMExtra), LLVMValueRef, (LLVMContextRef, LLVMMetadataRef), C, MD)
 end

src/base.jl

@@ -15,10 +15,6 @@ end
 # calling `refcheck` on the ref field argument
 macro checked(typedef)
     # decode structure definition
-    if Meta.isexpr(typedef, :macrocall)
-        # handle `@compat` prefixing 0.6-style type declarations
-        typedef = macroexpand(typedef)
-    end
     if Meta.isexpr(typedef, :struct)
         structure = typedef.args[2]
         body = typedef.args[3]