4 files changed, 21 insertions, 10 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala
index 65f2c95f73..99acc34811 100644
--- a/src/repl/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala
@@ -889,7 +889,7 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
     }
 
     class ClassBasedWrapper extends Wrapper {
-      def preambleHeader = "class %s extends _root_.java.io.Serializable { "
+      def preambleHeader = "sealed class %s extends _root_.java.io.Serializable { "
 
       /** Adds an object that instantiates the outer wrapping class. */
       def postamble  = s"""
diff --git a/test/files/run/repl-inline.check b/test/files/run/repl-inline.check
index 3b29f4d047..db729a67dd 100644
--- a/test/files/run/repl-inline.check
+++ b/test/files/run/repl-inline.check
@@ -4,3 +4,8 @@ g: String
 h: String
 g: String
 h: String
+callerOfCaller: String
+g: String
+h: String
+g: String
+h: String
diff --git a/test/files/run/repl-inline.scala b/test/files/run/repl-inline.scala
index 5a5f205ad8..260ed28a4f 100644
--- a/test/files/run/repl-inline.scala
+++ b/test/files/run/repl-inline.scala
@@ -1,7 +1,8 @@
 import scala.tools.nsc._
 
 object Test {
-  val testCode = """
+  val testCode =
+    """
 def callerOfCaller = Thread.currentThread.getStackTrace.drop(2).head.getMethodName
 def g = callerOfCaller
 def h = g
@@ -12,10 +13,15 @@ assert(h == "h", h)
   """
 
   def main(args: Array[String]) {
-    val settings = new Settings()
-    settings.processArgumentString("-opt:l:classpath")
-    settings.usejavacp.value = true
-    val repl = new interpreter.IMain(settings)
-    testCode.linesIterator.foreach(repl.interpret(_))
+    def test(f: Settings => Unit): Unit = {
+      val settings = new Settings()
+      settings.processArgumentString("-opt:l:classpath")
+      f(settings)
+      settings.usejavacp.value = true
+      val repl = new interpreter.IMain(settings)
+      testCode.linesIterator.foreach(repl.interpret(_))
+    }
+    test(_ => ())
+    test(_.Yreplclassbased.value = true)
   }
 }
diff --git a/test/files/run/t7747-repl.check b/test/files/run/t7747-repl.check
index 621a70205e..ab37da5722 100644
--- a/test/files/run/t7747-repl.check
+++ b/test/files/run/t7747-repl.check
@@ -246,12 +246,12 @@ scala> case class Bingo()
 defined class Bingo
 
 scala> List(BippyBups(), PuppyPups(), Bingo()) // show
-class $read extends _root_.java.io.Serializable {
+sealed class $read extends _root_.java.io.Serializable {
   def <init>() = {
     super.<init>;
     ()
   };
-  class $iw extends _root_.java.io.Serializable {
+  sealed class $iw extends _root_.java.io.Serializable {
     def <init>() = {
       super.<init>;
       ()
@@ -262,7 +262,7 @@ class $read extends _root_.java.io.Serializable {
     import $line45.$read.INSTANCE.$iw.$iw.PuppyPups;
     import $line46.$read.INSTANCE.$iw.$iw.Bingo;
     import $line46.$read.INSTANCE.$iw.$iw.Bingo;
-    class $iw extends _root_.java.io.Serializable {
+    sealed class $iw extends _root_.java.io.Serializable {
       def <init>() = {
         super.<init>;
         ()