Merge remote-tracking branch 'origin/master' into pr/enter-elimination-mode

* origin/master:
  An attempt to make tests deterministic.
  SI-7427 stop crashing under -Ydebug.

4 files changed, 7 insertions, 2 deletions

diff --git a/test/files/pos/t7427.flags b/test/files/pos/t7427.flags
new file mode 100644
index 0000000000..9c7d6400fc
--- /dev/null
+++ b/test/files/pos/t7427.flags
@@ -0,0 +1 @@
+-Ydebug
diff --git a/test/files/pos/t7427.scala b/test/files/pos/t7427.scala
new file mode 100644
index 0000000000..cca52950d1
--- /dev/null
+++ b/test/files/pos/t7427.scala
@@ -0,0 +1,4 @@
+// Compiles with no options
+// Compiles with -Ydebug -Ydisable-unreachable-prevention
+// Crashes with -Ydebug
+trait Bippy { 3 match { case 3 => } }
diff --git a/test/files/presentation/ide-bug-1000531.check b/test/files/presentation/ide-bug-1000531.check
index 980bb0a25d..be8805330a 100644
--- a/test/files/presentation/ide-bug-1000531.check
+++ b/test/files/presentation/ide-bug-1000531.check
@@ -7,7 +7,7 @@ retrieved 124 members
 [inaccessible] protected[package lang] def clone(): Object
 [inaccessible] protected[package lang] def finalize(): Unit
 [inaccessible] protected[this] def reversed: List[B]
-class GroupedIterator[B <: <?>] extends AbstractIterator[Seq[B]] with Iterator[Seq[B]]
+class GroupedIterator[B >: A] extends AbstractIterator[Seq[B]] with Iterator[Seq[B]]
 def +(other: String): String
 def ++[B >: B](that: => scala.collection.GenTraversableOnce[B]): Iterator[B]
 def ->[B](y: B): (java.util.Iterator[B], B)
diff --git a/test/files/presentation/implicit-member.check b/test/files/presentation/implicit-member.check
index 92d8e38abe..acf7e1a0fd 100644
--- a/test/files/presentation/implicit-member.check
+++ b/test/files/presentation/implicit-member.check
@@ -15,7 +15,7 @@ def formatted(fmtstr: String): String
 def hashCode(): Int
 def toString(): String
 def →[B](y: B): (Implicit.type, B)
-final class AppliedImplicit[A <: <?>] extends AnyRef
+final class AppliedImplicit[A] extends AnyRef
 final def !=(x$1: Any): Boolean
 final def !=(x$1: AnyRef): Boolean
 final def ##(): Int