Merge branch 'release/0.18'

crystal-lang · Jun 27, 2016 · b87cff7 · b87cff7
2 parents 9a9c49e + 7b8f593
commit b87cff7
Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/Dockerfile.release b/Dockerfile.release
@@ -1,6 +1,8 @@
 FROM ubuntu:14.04
 
 RUN \
+  apt-get update && \
+  apt-get install -y apt-transport-https && \
   apt-key adv --keyserver keys.gnupg.net --recv-keys 09617FD37CC06B54 && \
   echo "deb https://dist.crystal-lang.org/apt crystal main" > /etc/apt/sources.list.d/crystal.list && \
   apt-get update && \

diff --git a/spec/compiler/type_inference/def_overload_spec.cr b/spec/compiler/type_inference/def_overload_spec.cr
@@ -881,6 +881,18 @@ describe "Type inference: def overload" do
       )) { tuple_of([char, int32]) }
   end
 
+  it "doesn't crash on unknown metaclass" do
+    assert_type(%(
+      def foo(x : Foo.class)
+      end
+
+      def foo(x : Bar.class)
+      end
+
+      1
+      )) { int32 }
+  end
+
   it "overloads union against non-union (#2904)" do
     assert_type(%(
       def foo(x : Int32?)

diff --git a/src/compiler/crystal/semantic/type_lookup.cr b/src/compiler/crystal/semantic/type_lookup.cr
@@ -61,6 +61,8 @@ module Crystal
 
     def visit(node : Metaclass)
       node.name.accept self
+      return false if !@raise && !@type
+
       @type = type.virtual_type.metaclass.virtual_type
       false
     end