crystal-lang · Jul 22, 2016 · Jul 22, 2016 · Jul 22, 2016
diff --git a/spec/compiler/type_inference/module_spec.cr b/spec/compiler/type_inference/module_spec.cr
@@ -966,4 +966,20 @@ describe "Type inference: module" do
       ),
       "undefined constant X::Bar"
   end
+
+  it "can restrict module with module (#3029)" do
+    assert_type(%(
+      module Foo
+      end
+
+      class Gen(T)
+      end
+
+      def foo(x : Gen(Foo))
+        1
+      end
+
+      foo(Gen(Foo).new)
+      )) { int32 }
+  end
 end
diff --git a/spec/compiler/type_inference/proc_spec.cr b/spec/compiler/type_inference/proc_spec.cr
@@ -899,4 +899,26 @@ describe "Type inference: proc" do
       Foo.new.x
       )) { proc_of([int32, char, string]) }
   end
+
+  it "can assign NoReturn proc to other proc (#3032)" do
+    assert_type(%(
+      lib LibC
+        fun exit : NoReturn
+      end
+
+      class Foo
+        @x : -> Int32
+
+        def initialize
+          @x = ->{ LibC.exit }
+        end
+
+        def x
+          @x
+        end
+      end
+
+      Foo.new.x
+      )) { proc_of(int32) }
+  end
 end
diff --git a/src/compiler/crystal/codegen/codegen.cr b/src/compiler/crystal/codegen/codegen.cr
@@ -837,7 +837,7 @@ module Crystal
         return false
       when Path
         const = target.target_const.not_nil!
-        if const.used && !const.simple?
+        if const.used? && !const.simple?
           initialize_const(const)
         end
         @last = llvm_nil

diff --git a/src/compiler/crystal/semantic/base_type_visitor.cr b/src/compiler/crystal/semantic/base_type_visitor.cr
@@ -46,6 +46,8 @@ module Crystal
           type.vars = const_def.vars
           type.visitor = self
           type.used = true
+
+          program.class_var_and_const_initializers << type
         end
 
         node.target_const = type

diff --git a/src/compiler/crystal/semantic/cleanup_transformer.cr b/src/compiler/crystal/semantic/cleanup_transformer.cr
@@ -209,7 +209,7 @@ module Crystal
 
       if target.is_a?(Path)
         const = target.target_const.not_nil!
-        return node unless const.used
+        return node unless const.used?
       end
 
       node.value = node.value.transform self

diff --git a/src/compiler/crystal/semantic/restrictions.cr b/src/compiler/crystal/semantic/restrictions.cr
@@ -802,9 +802,7 @@ module Crystal
 
   class NonGenericModuleType
     def restrict(other, context)
-      return self if self == other
-
-      including_types.try &.restrict(other, context)
+      super || including_types.try(&.restrict(other, context))
     end
   end
 

diff --git a/src/compiler/crystal/semantic/type_merge.cr b/src/compiler/crystal/semantic/type_merge.cr
@@ -257,6 +257,20 @@ module Crystal
     end
   end
 
+  class ProcInstanceType
+    def common_ancestor(other : ProcInstanceType)
+      if return_type.no_return? && arg_types == other.arg_types
+        return other
+      end
+
+      if other.return_type.no_return? && arg_types == other.arg_types
+        return self
+      end
+
+      nil
+    end
+  end
+
   class TupleInstanceType
     def common_ancestor(other : TupleInstanceType)
       return nil unless self.size == other.size

diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
@@ -2834,7 +2834,7 @@ module Crystal
     getter scope_types : Array(Type)
     getter scope : Type?
     property vars : MetaVars?
-    property used : Bool
+    property? used : Bool
     property? visited : Bool
     property visitor : BaseTypeVisitor?
 
@@ -3140,7 +3140,8 @@ module Crystal
 
     def implements?(other : Type)
       if other.is_a?(ProcInstanceType)
-        if other.return_type.void? && arg_types == other.arg_types
+        if (self.return_type.no_return? || other.return_type.void?) &&
+           arg_types == other.arg_types
           return true
         end
       end