Backed out: Fix NPE in generic inference.

mirah · Mar 1, 2016 · 2fbd9c4 · 2fbd9c4
1 parent febb591
commit 2fbd9c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/org/mirah/jvm/mirrors/base_type.mirah b/src/org/mirah/jvm/mirrors/base_type.mirah
@@ -402,7 +402,7 @@ class AsyncMirror < BaseType
   end
 
   def interfaces:TypeFuture[]
-    @interfaces || super
+    @interfaces
   end
 
   def isFullyResolved():boolean

diff --git a/src/org/mirah/jvm/mirrors/generics/xx_type_invoker.mirah b/src/org/mirah/jvm/mirrors/generics/xx_type_invoker.mirah
@@ -34,7 +34,6 @@ import org.mirah.jvm.mirrors.MirrorType
 import org.mirah.jvm.model.Cycle
 import org.mirah.jvm.model.IntersectionType
 import org.mirah.typer.TypeFuture
-import org.mirah.typer.SimpleFuture
 import org.mirah.util.Context
 
 class IgnoredTypeBuilder < SignatureVisitor
@@ -56,8 +55,7 @@ class TypeInvoker < BaseSignatureReader
   end
 
   def saveTypeParam(var)
-    val = @args.isEmpty ? SimpleFuture.new(var) : @args.removeFirst
-    typeVariables[var.toString] = val
+    typeVariables[var.toString] = @args.removeFirst unless @args.isEmpty
     @typeParams.add(var)
   end