diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala
index e483fa6ba854..44381e4ab237 100644
--- a/src/reflect/scala/reflect/internal/Types.scala
+++ b/src/reflect/scala/reflect/internal/Types.scala
@@ -1999,7 +1999,9 @@ trait Types
       if (sym.typeParams.size != args.size)
         devWarning(s"$this.transform($tp), but tparams.isEmpty and args=$args")
 
-      asSeenFromOwner(tp).instantiateTypeParams(sym.typeParams, args)
+      val GenPolyType(tparams, result) = asSeenFromOwner(tp)
+      assert((tparams eq Nil) || tparams == sym.typeParams, (tparams, sym.typeParams))
+      result.instantiateTypeParams(sym.typeParams, args)
     }
 
     // note: does not go through typeRef. There's no need to because
@@ -2309,7 +2311,14 @@ trait Types
       }
       thisInfo.decls
     }
-    protected[Types] def baseTypeSeqImpl: BaseTypeSeq = sym.info.baseTypeSeq map transform
+    protected[Types] def baseTypeSeqImpl: BaseTypeSeq =
+      if (sym.info.baseTypeSeq exists (_.typeSymbolDirect.isAbstractType))
+        // SI-8046 base type sequence might have more elements in a subclass, we can't map it element wise.
+        transform(sym.info).baseTypeSeq
+      else
+        // Optimization: no abstract types, we can compute the BTS of this TypeRef as an element-wise map
+        //               of the BTS of the referenced symbol.
+        sym.info.baseTypeSeq map transform
 
     override def baseTypeSeq: BaseTypeSeq = {
       val cache = baseTypeSeqCache
diff --git a/test/pending/pos/t8046c.scala b/test/files/pos/t8046c.scala
similarity index 99%
rename from test/pending/pos/t8046c.scala
rename to test/files/pos/t8046c.scala
index 9a8616828d54..f05b4c15b547 100644
--- a/test/pending/pos/t8046c.scala
+++ b/test/files/pos/t8046c.scala
@@ -5,7 +5,7 @@ trait One {
 
 trait Three extends One {
   trait Op[A] extends (A => A)
- 
+
   def f1(f: Op[Int])            = f(5)
   def f2(f: Alias[Int])         = f(5)
   def f3[T <: Op[Int]](f: T)    = f(5)
diff --git a/test/files/run/t8046.check b/test/files/run/t8046.check
new file mode 100644
index 000000000000..905b0b35ca1d
--- /dev/null
+++ b/test/files/run/t8046.check
@@ -0,0 +1,2 @@
+List(trait Op, trait Function1, class Object, class Any)
+BTS(T,Three.this.Op[Int],Int => Int,Object,Any)
diff --git a/test/files/run/t8046/Test.scala b/test/files/run/t8046/Test.scala
new file mode 100644
index 000000000000..f6b525d1b5a1
--- /dev/null
+++ b/test/files/run/t8046/Test.scala
@@ -0,0 +1,18 @@
+import scala.tools.partest._
+
+object Test extends DirectTest {
+  override def code = ""
+  override def extraSettings: String = "-usejavacp"
+
+  override def show() {
+    val c = newCompiler()
+    new c.Run
+    import c._
+
+    val f4 = typeOf[Three].member(newTermName("f4"))
+    val f4ParamInfo = f4.paramss.head.head.info
+    println(f4ParamInfo.baseClasses)
+    println(f4ParamInfo.baseTypeSeq)
+  }
+}
+
diff --git a/test/files/run/t8046/t8046c.scala b/test/files/run/t8046/t8046c.scala
new file mode 100644
index 000000000000..0b484da53070
--- /dev/null
+++ b/test/files/run/t8046/t8046c.scala
@@ -0,0 +1,13 @@
+import language._
+
+trait One {
+  type Op[A]
+  type Alias[A] = Op[A]
+}
+
+trait Three extends One {
+  trait Op[A] extends (A => A)
+
+  def f4[T <: Alias[Int]](f: T) = 0
+}
+