Merge pull request scala#6459 from lrytz/merge-2.12-to-2.13-mar-22

Merge 2.12 to 2.13 mar 22

Author: lrytz

.travis.yml

@@ -48,7 +48,7 @@ jobs:
           - rm -rf build/ # ensure we resolve from artifactory
           - buildModules
           - buildQuick clean publish
-          - set | grep -E '^updatedModuleVersions=|^SCALA_VER=|^publishToSonatype=' > build/env
+          - set | grep -E '^SCALA_VER=|^SCALA_BINARY_VER=|^scalaVersionTasks=|^XML_VER=|^PARTEST_VER=|^SCALACHECK_VER=|^XML_BUILT=|^PARTEST_BUILT=|^SCALACHECK_REF=|^updatedModuleVersions=|^publishToSonatype=' > build/env
           - cat build/env
 
       # this builds the spec using jekyll

scripts/jobs/integrate/bootstrap

@@ -9,11 +9,11 @@ sbtArgs="-ivy $IVY2_DIR -Dsbt.override.build.repos=true -Dsbt.repository.config=
 
 source scripts/bootstrap_fun
 
+generateRepositoriesConfig $integrationRepoUrl
+
 determineScalaVersion
 deriveModuleVersions
 
-generateRepositoriesConfig $integrationRepoUrl
-
 removeExistingBuilds $integrationRepoUrl
 clearIvyCache
 

src/compiler/scala/tools/nsc/backend/jvm/ClassfileWriters.scala

@@ -143,7 +143,10 @@ abstract class ClassfileWriters {
           try Files.createDirectories(parent, noAttributes: _*)
           catch {
             case e: FileAlreadyExistsException =>
-              throw new FileConflictException(s"Can't create directory $parent; there is an existing (non-directory) file in its path", e)
+              // `createDirectories` reports this exception if `parent` is an existing symlink to a directory
+              // but that's fine for us (and common enough, `scalac -d /tmp` on mac targets symlink).
+              if (!Files.isDirectory(parent))
+                throw new FileConflictException(s"Can't create directory $parent; there is an existing (non-directory) file in its path", e)
           }
           builtPaths.put(baseDir, TRUE)
           var current = parent

src/compiler/scala/tools/nsc/backend/jvm/opt/BytecodeUtils.scala

@@ -141,6 +141,15 @@ object BytecodeUtils {
     else previousExecutableInstruction(prev, stopBefore)
   }
 
+  @tailrec def previousLineNumber(insn: AbstractInsnNode): Option[Int] = {
+    val prev = insn.getPrevious
+    prev match {
+      case null => None
+      case line: LineNumberNode => Some(line.line)
+      case _ => previousLineNumber(prev)
+    }
+  }
+
   @tailrec def nextExecutableInstruction(insn: AbstractInsnNode, alsoKeep: AbstractInsnNode => Boolean = Set()): Option[AbstractInsnNode] = {
     val next = insn.getNext
     if (next == null || isExecutable(next) || alsoKeep(next)) Option(next)

src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala

@@ -440,6 +440,19 @@ abstract class Inliner {
     // label for the exit of the inlined functions. xRETURNs are replaced by GOTOs to this label.
     val postCallLabel = newLabelNode
     clonedInstructions.add(postCallLabel)
+    if (sameSourceFile) {
+      BytecodeUtils.previousLineNumber(callsiteInstruction) match {
+        case Some(line) =>
+          BytecodeUtils.nextExecutableInstruction(callsiteInstruction).flatMap(BytecodeUtils.previousLineNumber) match {
+            case Some(line1) =>
+              if (line == line1)
+              // SD-479 code follows on the same line, restore the line number
+                clonedInstructions.add(new LineNumberNode(line, postCallLabel))
+            case None =>
+          }
+        case None =>
+      }
+    }
 
     // replace xRETURNs:
     //   - store the return value (if any)

src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala

@@ -524,6 +524,7 @@ abstract class LocalOpt {
         case i: IincInsnNode if isLive =>
           maxLocals = math.max(maxLocals, i.`var` + 1)
 
+        case _: LineNumberNode =>
         case _ =>
           if (!isLive || insn.getOpcode == NOP) {
             // Instruction iterators allow removing during iteration.

test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala

@@ -1551,11 +1551,11 @@ class InlinerTest extends BytecodeTesting {
 
     assertSameCode(is("t2"), List(
       Label(0), LineNumber(3, Label(0)), VarOp(ALOAD, 0), Invoke(INVOKEVIRTUAL, "B", "fx", "()V", false),
-      Label(4), LineNumber(4, Label(4)), Op(ICONST_1), Op(IRETURN), Label(8)))
+      Label(4), LineNumber(4, Label(4)), Op(ICONST_1), Label(7), LineNumber(13, Label(7)), Op(IRETURN), Label(10)))
 
     assertSameCode(is("t3"), List(
       Label(0), LineNumber(9, Label(0)), VarOp(ALOAD, 0), Invoke(INVOKEVIRTUAL, "C", "fx", "()V", false),
-      Label(4), LineNumber(10, Label(4)), Op(ICONST_1), Op(IRETURN), Label(8)))
+      Label(4), LineNumber(10, Label(4)), Op(ICONST_1), Label(7), LineNumber(14, Label(7)), Op(IRETURN), Label(10)))
   }
 
   @Test
@@ -1754,4 +1754,22 @@ class InlinerTest extends BytecodeTesting {
     assertDoesNotInvoke(i, "f")
     assertInvoke(i, "T", "T$_setter_$x_$eq")
   }
+
+  @Test
+  def sd479_same_unit_inlining_line_number(): Unit = {
+    val code =
+      """class Test {
+        |  @inline final def foo(b: Boolean): String = {
+        |    "foo"
+        |  }
+        |
+        |  def bar(a: AnyRef, b: Boolean): AnyRef = {
+        |    foo(b); a.toString // line 7
+        |  }
+        |}
+      """.stripMargin
+    val List(t) = compileClasses(code)
+    val i = getMethod(t, "bar")
+    assertSameCode(i.instructions, List(Label(0), LineNumber(7, Label(0)), VarOp(ALOAD, 1), Invoke(INVOKEVIRTUAL, "java/lang/Object", "toString", "()Ljava/lang/String;", false), Op(ARETURN), Label(5)))
+  }
 }

test/junit/scala/tools/nsc/backend/jvm/opt/UnreachableCodeTest.scala

@@ -8,6 +8,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
 import scala.tools.asm.Opcodes._
+import scala.tools.asm.tree.ClassNode
 import scala.tools.partest.ASMConverters._
 import scala.tools.testing.AssertUtil._
 import scala.tools.testing.BytecodeTesting._
@@ -245,4 +246,21 @@ class UnreachableCodeTest extends ClearAfterClass {
     assertSameSummary(getMethod(cDCE, "t3"), List(ALOAD, NEW, DUP, LDC, "<init>", ATHROW))
     assertSameSummary(getMethod(cDCE, "t4"), List(ALOAD, ALOAD, "nt", ATHROW))
   }
+
+  @Test
+  def patmatDefaultLineNumber(): Unit = {
+    val code =
+      """class Test {
+        |  def test = (this: AnyRef) match {
+        |    case _: String =>
+        |      "line4" // the synthetic `throw new MatchError` used to be positioned, here, despite the fact that patmat positions it at line 3.
+        |  }
+        |}
+        |""".stripMargin
+    val test: ClassNode = dceCompiler.compileClass(code)
+    val i = getAsmMethod(test, "test")
+    val instr = findInstrs(i, "NEW scala/MatchError").head
+    val lineNumber = BytecodeUtils.previousLineNumber(instr)
+    assertEquals(Some(2), lineNumber)
+  }
 }