From f6d90a8a2502c0e1f0ecf72a2fd4258c4f52ec84 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Wed, 2 Jan 2013 07:36:58 -0800
Subject: [backport] SI-5378, unsoundness with type bounds in refinements.

As the comment says:

Not enough to look for abstract types; have to recursively check
the bounds of each abstract type for more abstract types. Almost
certainly there are other exploitable type soundness bugs which
can be seen by bounding a type parameter by an abstract type which
itself is bounded by an abstract type.

SPECIAL: BUY ONE UNSOUNDNESS, GET ONE FREE

In refinement types, only the first parameter list of methods
was being analyzed for unsound uses of abstract types. Second
parameter list and beyond had free unsoundness reign. That bug
as well is fixed here.
---
 test/files/neg/t5378.check | 31 ++++++++++++++++++++++++++
 test/files/neg/t5378.scala | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 test/files/neg/t5378.check
 create mode 100644 test/files/neg/t5378.scala

(limited to 'test/files/neg')

diff --git a/test/files/neg/t5378.check b/test/files/neg/t5378.check
new file mode 100644
index 0000000000..c1460083f6
--- /dev/null
+++ b/test/files/neg/t5378.check
@@ -0,0 +1,31 @@
+t5378.scala:7: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+  def contains = new { def apply[T1 <: T](value: T1) = ??? }
+                                          ^
+t5378.scala:8: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+  def contains1 = new { def apply[T1 <: A1](value: T1) = ??? }
+                                            ^
+t5378.scala:9: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+  def contains2 = new { def apply[T1 <: A2](value: T1) = ??? }
+                                            ^
+t5378.scala:15: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+    new Bippy { def apply[T1 <: T](value: T1) = ??? }
+                                   ^
+t5378.scala:16: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+    new Bippy { def apply[T1 <: B1](value: T1) = ??? }
+                                    ^
+t5378.scala:17: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+    new Bippy { def apply[T1 <: B2](value: T1) = ??? }
+                                    ^
+t5378.scala:21: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+      def apply1[T1 <: B3](value: T1) = ???
+                           ^
+t5378.scala:23: error: Parameter type in structural refinement may not refer to an abstract type defined outside that refinement
+      def apply3(value: B3) = ???
+                 ^
+t5378.scala:28: error: Parameter type in structural refinement may not refer to an abstract type defined outside that refinement
+    def apply1(s: String)(x: Int)(value: T) = ???
+                                  ^
+t5378.scala:29: error: Type bound in structural refinement may not refer to an abstract type defined outside that refinement
+    def apply2[T1 <: T](s: String)(x: Int)(value: T1) = ???
+                                           ^
+10 errors found
diff --git a/test/files/neg/t5378.scala b/test/files/neg/t5378.scala
new file mode 100644
index 0000000000..fa6afa02be
--- /dev/null
+++ b/test/files/neg/t5378.scala
@@ -0,0 +1,54 @@
+import scala.language.reflectiveCalls
+
+class Coll[+T] {
+  type A1 <: T
+  type A2 <: A1
+
+  def contains = new { def apply[T1 <: T](value: T1) = ??? }
+  def contains1 = new { def apply[T1 <: A1](value: T1) = ??? }
+  def contains2 = new { def apply[T1 <: A2](value: T1) = ??? }
+  def contains3 = {
+    trait Bippy {
+      type B1 <: T
+      type B2 <: B1
+    }
+    new Bippy { def apply[T1 <: T](value: T1) = ??? }
+    new Bippy { def apply[T1 <: B1](value: T1) = ??? }
+    new Bippy { def apply[T1 <: B2](value: T1) = ??? }
+    new Bippy {
+      type B3 = B2
+      type B4 = List[B2]
+      def apply1[T1 <: B3](value: T1) = ???
+      def apply2[T1 <: B4](value: T1) = ???
+      def apply3(value: B3) = ???
+      def apply4(value: B4) = value.head
+    }
+  }
+  def contains4 = new {
+    def apply1(s: String)(x: Int)(value: T) = ???
+    def apply2[T1 <: T](s: String)(x: Int)(value: T1) = ???
+  }
+  def containsOk = {
+    trait Bippy {
+      type B1 <: AnyRef
+      type B2 <: B1
+    }
+    new Bippy { def apply[T1 <: AnyRef](value: T1) = ??? }
+    new Bippy { type B1 = String ; def apply[T1 <: B1](value: T1) = ??? }
+    new Bippy { type B2 = String ; def apply[T1 <: B2](value: T1) = ??? }
+  }
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val xs = new Coll[List[String]]
+    val ys: Coll[Traversable[String]] = xs
+
+    println(ys contains Nil)
+    // java.lang.NoSuchMethodException: Coll$$anon$1.apply(scala.collection.Traversable)
+    //  at java.lang.Class.getMethod(Class.java:1605)
+    //  at Test$.reflMethod$Method1(a.scala:14)
+    //  at Test$.main(a.scala:14)
+    //  at Test.main(a.scala)
+  }
+}
-- 
cgit v1.2.3