Merge branch 'release/0.18'

crystal-lang · Jun 24, 2016 · 9cf6e06 · 9cf6e06
2 parents c49f41a + a11133f
commit 9cf6e06
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/compiler/crystal/codegen/codegen.cr b/src/compiler/crystal/codegen/codegen.cr
@@ -1895,16 +1895,19 @@ module Crystal
 
     def array_malloc(type, count)
       @malloc_fun ||= @main_mod.functions[MALLOC_NAME]?
+      size = trunc(type.size, LLVM::Int32)
+      count = trunc(count, LLVM::Int32)
+      size = builder.mul size, count
       if malloc_fun = @malloc_fun
         malloc_fun = check_main_fun MALLOC_NAME, malloc_fun
-        size = trunc(type.size, LLVM::Int32)
-        count = trunc(count, LLVM::Int32)
-        size = builder.mul size, count
         pointer = call malloc_fun, size
         memset pointer, int8(0), size
         bit_cast pointer, type.pointer
       else
-        builder.array_malloc(type, count)
+        pointer = builder.array_malloc(type, count)
+        void_pointer = bit_cast pointer, LLVM::VoidPointer
+        memset void_pointer, int8(0), size
+        pointer
       end
     end