put behind -Xsource:2.14 flag

scala · Sep 10, 2019 · 6e7add6 · 6e7add6
1 parent 491a536
commit 6e7add6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Unapplies.scala b/src/compiler/scala/tools/nsc/typechecker/Unapplies.scala
@@ -97,7 +97,8 @@ trait Unapplies extends ast.TreeDSL {
   }
 
 
-  private def applyShouldInheritAccess(mods: Modifiers) = mods.hasFlag(PRIVATE) || (!mods.hasFlag(PROTECTED) && mods.hasAccessBoundary)
+  private def applyShouldInheritAccess(mods: Modifiers) =
+    currentRun.isScala214 && (mods.hasFlag(PRIVATE) || (!mods.hasFlag(PROTECTED) && mods.hasAccessBoundary))
 
   /** The module corresponding to a case class; overrides toString to show the module's name
    */
@@ -270,9 +271,14 @@ trait Unapplies extends ast.TreeDSL {
       val classTpe = classType(cdef, tparams)
       val argss = mmap(paramss)(toIdent)
       val body: Tree = New(classTpe, argss)
-      val inheritedMods = constrMods(cdef)
+      val copyMods =
+        if (currentRun.isScala214) {
+          val inheritedMods = constrMods(cdef)
+          Modifiers(SYNTHETIC | (inheritedMods.flags & AccessFlags), inheritedMods.privateWithin)
+        }
+        else Modifiers(SYNTHETIC)
       val copyDefDef = atPos(cdef.pos.focus)(
-        DefDef(Modifiers(SYNTHETIC | (inheritedMods.flags & AccessFlags), inheritedMods.privateWithin), nme.copy, tparams, paramss, TypeTree(), body)
+        DefDef(copyMods, nme.copy, tparams, paramss, TypeTree(), body)
       )
       Some(copyDefDef)
     }

diff --git a/test/files/neg/caseclass_private_constructor.flags b/test/files/neg/caseclass_private_constructor.flags
@@ -0,0 +1 @@
+-Xsource:2.14
diff --git a/test/files/pos/caseclass_private_constructor.flags b/test/files/pos/caseclass_private_constructor.flags
@@ -0,0 +1 @@
+-Xsource:2.14