Merge branch 'release/0.18'

crystal-lang · Jul 2, 2016 · 8a10530 · 8a10530
2 parents a4df5f2 + 752bb8d
commit 8a10530
Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/compiler/crystal/codegen/class_var.cr b/src/compiler/crystal/codegen/class_var.cr
@@ -8,10 +8,15 @@ require "./codegen"
 class Crystal::CodeGenVisitor
   def declare_class_var(owner, name, type, thread_local)
     global_name = class_var_global_name(owner, name)
-    global = @main_mod.globals[global_name]? ||
-      @main_mod.globals.add(llvm_type(type), global_name)
-    global.linkage = LLVM::Linkage::Internal if @single_module
-    global.thread_local = true if thread_local
+    global = @main_mod.globals[global_name]?
+    unless global
+      global = @main_mod.globals.add(llvm_type(type), global_name)
+      global.linkage = LLVM::Linkage::Internal if @single_module
+      global.thread_local = true if thread_local
+      if !global.initializer && type.includes_type?(@mod.nil_type)
+        global.initializer = llvm_type(type).null
+      end
+    end
     global
   end
 
@@ -138,11 +143,7 @@ class Crystal::CodeGenVisitor
         elsif @last.constant? && (type.is_a?(PrimitiveType) || type.is_a?(EnumType))
           global.initializer = @last
         else
-          if type.passed_by_value?
-            global.initializer = llvm_type(type).undef
-          else
-            global.initializer = llvm_type(type).null
-          end
+          global.initializer = llvm_type(type).null
           assign global, type, node.type, @last
         end
 

diff --git a/src/compiler/crystal/codegen/const.cr b/src/compiler/crystal/codegen/const.cr
@@ -142,12 +142,7 @@ class Crystal::CodeGenVisitor
             const.initializer = @last
           end
         else
-          if const.value.type.passed_by_value?
-            global.initializer = llvm_type(const.value.type).undef
-          else
-            global.initializer = @last.type.null
-          end
-
+          global.initializer = llvm_type(const.value.type).null
           store @last, global
         end