Vulpix test framework cleaned-up

There are four types of tests in the Vulpix framework:
positive compilation, negative compilation, run and fuzzy.
They shared a deal of common logic on which a lot of hacks
was done over time. This lead to them doing essentially the same
thing in different ways and with minor semantic differences.
This commit makes the code in question more DRY and abstracts
away the common logic for the four test types.

Author: anatoliykmetyuk

.drone.yml

@@ -20,50 +20,41 @@ pipeline:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test:
     group: test
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
       - ./project/scripts/sbt ";compile ;test"
       - ./project/scripts/cmdTests
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
       - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test; dotty-semanticdb/compile; dotty-semanticdb/test:compile;sjsSandbox/run"
       - ./project/scripts/bootstrapCmdTests
 
   community_build:
     group: test
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     commands:
       - cp -R . /tmp/3/ && cd /tmp/3/
       - git submodule update --init --recursive --jobs 7
       - ./project/scripts/sbt community-build/test
 
   test_sbt:
     group: test
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
       - ./project/scripts/sbt sbt-dotty/scripted
     when:
       # sbt scripted tests are slow and only run on nightly or deployment
       event: [ tag, deployment ]
 
-  test_scala212:
-    group: test
-    image: lampepfl/dotty:2019-04-22
-    commands:
-      - cp -R . /tmp/5/ && cd /tmp/5/
-      - ./project/scripts/sbt ";++2.12.8 ;compile ;test"
-    when:
-      event: [ push, tag, deployment ]
-
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_token ]
@@ -75,7 +66,7 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     environment:
       - NIGHTLYBUILD=yes
     commands:
@@ -86,7 +77,7 @@ pipeline:
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     environment:
       - RELEASEBUILD=yes
     commands:
@@ -110,7 +101,7 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2019-04-22
+    image: lampepfl/dotty:2019-02-06
     environment:
       - RELEASEBUILD=yes
     commands:

community-build/community-projects/stdLib213

@@ -119,16 +119,15 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
 
         // binary operation
         case rarg :: Nil =>
-          val isShift = isShiftOp(code)
-          resKind = tpeTK(larg).maxType(if (isShift) INT else tpeTK(rarg))
-
-          if (isShift || isBitwiseOp(code)) {
+          resKind = tpeTK(larg).maxType(tpeTK(rarg))
+          if (isShiftOp(code) || isBitwiseOp(code)) {
             assert(resKind.isIntegralType || (resKind == BOOL),
                    s"$resKind incompatible with arithmetic modulo operation.")
           }
 
           genLoad(larg, resKind)
-          genLoad(rarg, if (isShift) INT else resKind)
+          genLoad(rarg, // check .NET size of shift arguments!
+                  if (isShiftOp(code)) INT else resKind)
 
           (code: @switch) match {
             case ADD => bc add resKind

compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

@@ -200,21 +200,16 @@ class BTypesFromSymbols[I <: BackendInterface](val int: I) extends BTypes {
 
     val finalFlag = sym.getsJavaFinalFlag
 
+    // Primitives are "abstract final" to prohibit instantiation
+    // without having to provide any implementations, but that is an
+    // illegal combination of modifiers at the bytecode level so
+    // suppress final if abstract if present.
     import asm.Opcodes._
     GenBCodeOps.mkFlags(
       if (privateFlag) ACC_PRIVATE else ACC_PUBLIC,
       if (sym.isDeferred || sym.hasAbstractFlag) ACC_ABSTRACT else 0,
       if (sym.isInterface) ACC_INTERFACE else 0,
-
-      if (finalFlag &&
-        // Primitives are "abstract final" to prohibit instantiation
-        // without having to provide any implementations, but that is an
-        // illegal combination of modifiers at the bytecode level so
-        // suppress final if abstract if present.
-        !sym.hasAbstractFlag &&
-        //  Mixin forwarders are bridges and can be final, but final bridges confuse some frameworks
-        !sym.isBridge)
-        ACC_FINAL else 0,
+      if (finalFlag && !sym.hasAbstractFlag) ACC_FINAL else 0,
       if (sym.isStaticMember) ACC_STATIC else 0,
       if (sym.isBridge) ACC_BRIDGE | ACC_SYNTHETIC else 0,
       if (sym.isArtifact) ACC_SYNTHETIC else 0,

compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala

@@ -482,19 +482,11 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
 
   private def verifySignature(sym: Symbol, sig: String)(implicit ctx: Context): Unit = {
     import scala.tools.asm.util.CheckClassAdapter
-    def wrap(body: => Unit): Unit = {
-      try body
-      catch {
-        case ex: Throwable =>
-          ctx.error(i"""|compiler bug: created invalid generic signature for $sym in ${sym.denot.owner.showFullName}
-                      |signature: $sig
-                      |if this is reproducible, please report bug at https://github.com/lampepfl/dotty/issues
-                   """.trim, sym.sourcePos)
-          throw  ex
-      }
-    }
+    def wrap(body: => Unit): Boolean =
+      try { body; true }
+      catch { case ex: Throwable => println(ex.getMessage); false }
 
-    wrap {
+    val valid = wrap {
       if (sym.is(Flags.Method)) {
         CheckClassAdapter.checkMethodSignature(sig)
       }
@@ -505,6 +497,14 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
         CheckClassAdapter.checkClassSignature(sig)
       }
     }
+
+    if (!valid) {
+      ctx.error(
+        i"""|compiler bug: created invalid generic signature for $sym in ${sym.denot.owner.showFullName}
+            |signature: $sig
+            |if this is reproducible, please report bug at https://github.com/lampepfl/dotty/issues
+        """.trim, sym.sourcePos)
+    }
   }
 
   /**
@@ -841,14 +841,8 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
 
     def addRemoteRemoteExceptionAnnotation: Unit = ()
 
-    def samMethod(): Symbol = ctx.atPhase(ctx.erasurePhase) { implicit ctx =>
-      toDenot(sym).info.abstractTermMembers.toList match {
-        case x :: Nil => x.symbol
-        case Nil => abort(s"${sym.show} is not a functional interface. It doesn't have abstract methods")
-        case xs => abort(s"${sym.show} is not a functional interface. " +
-          s"It has the following abstract methods: ${xs.map(_.name).mkString(", ")}")
-      }
-    }
+    def samMethod(): Symbol =
+      toDenot(sym).info.abstractTermMembers.headOption.getOrElse(toDenot(sym).info.member(nme.apply)).symbol
 
     def isFunctionClass: Boolean =
       defn.isFunctionClass(sym)

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -180,8 +180,8 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
             try   { /*withCurrentUnit(item.cunit)*/(visit(item)) }
             catch {
               case ex: Throwable =>
-                println(s"Error while emitting ${int.sourceFileFor(item.cunit)}")
-                throw ex
+                ex.printStackTrace()
+                ctx.error(s"Error while emitting ${int.sourceFileFor(item.cunit)}\n${ex.getMessage}")
             }
           }
         }
@@ -414,8 +414,8 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
               addToQ3(item)
             } catch {
               case ex: Throwable =>
-                println(s"Error while emitting ${item.plain.classNode.name}")
-                throw ex
+                ex.printStackTrace()
+                ctx.error(s"Error while emitting ${item.plain.classNode.name}\n${ex.getMessage}")
             }
           }
         }

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -7,7 +7,6 @@ import config.CompilerCommand
 import core.Comments.{ContextDoc, ContextDocstrings}
 import core.Contexts.{Context, ContextBase}
 import core.{MacroClassLoader, Mode, TypeError}
-import dotty.tools.dotc.ast.Positioned
 import reporting._
 
 import scala.util.control.NonFatal
@@ -56,7 +55,6 @@ class Driver {
     val summary = CompilerCommand.distill(args)(ctx)
     ctx.setSettings(summary.sstate)
     MacroClassLoader.init(ctx)
-    Positioned.updateDebugPos(ctx)
 
     if (!ctx.settings.YdropComments.value(ctx) || ctx.mode.is(Mode.ReadComments)) {
       ctx.setProperty(ContextDoc, new ContextDocstrings)

compiler/src/dotty/tools/dotc/Driver.scala

@@ -274,21 +274,27 @@ object desugar {
 
   /** Transforms a definition with a name starting with a `$` in a quoted pattern into a `quoted.binding.Binding` splice.
    *
-   *  The desugaring consists in adding the `@patternBindHole` annotation. This annotation is used during typing to perform the full transformation.
+   *  The desugaring consists in renaming the the definition and adding the `@patternBindHole` annotation. This
+   *  annotation is used during typing to perform the full transformation.
    *
    *  A definition
    *  ```scala
-   *    case '{ def $a(...) = ...; ... `$a`() ... } => a
+   *    case '{ def $a(...) = ... a() ...; ... a() ... }
    *  ```
    *  into
    *  ```scala
-   *    case '{ @patternBindHole def `$a`(...) = ...; ... `$a`() ... } => a
+   *    case '{ @patternBindHole def a(...) = ... a() ...; ... a() ... }
    *  ```
    */
   def transformQuotedPatternName(tree: ValOrDefDef)(implicit ctx: Context): ValOrDefDef = {
     if (ctx.mode.is(Mode.QuotedPattern) && !tree.isBackquoted && tree.name != nme.ANON_FUN && tree.name.startsWith("$")) {
+      val name = tree.name.toString.substring(1).toTermName
+      val newTree: ValOrDefDef = tree match {
+        case tree: ValDef => cpy.ValDef(tree)(name)
+        case tree: DefDef => cpy.DefDef(tree)(name)
+      }
       val mods = tree.mods.withAddedAnnotation(New(ref(defn.InternalQuoted_patternBindHoleAnnot.typeRef)).withSpan(tree.span))
-      tree.withMods(mods)
+      newTree.withMods(mods)
     } else tree
   }
 

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -24,13 +24,7 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Pro
   def uniqueId: Int = myUniqueId
 
   def uniqueId_=(id: Int): Unit = {
-    if (Positioned.debugId == id) {
-      def printTrace() = {
-        val stack = Thread.currentThread().getStackTrace().map(">   " + _)
-        System.err.println(stack.mkString(s"> Debug tree (id=${Positioned.debugId}) creation \n> $this\n", "\n", "\n"))
-      }
-      printTrace()
-    }
+    //assert(id != 2523, this)
     myUniqueId = id
   }
 
@@ -232,11 +226,3 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Pro
       throw ex
   }
 }
-
-object Positioned {
-  @sharable private[Positioned] var debugId = Int.MinValue
-
-  def updateDebugPos(implicit ctx: Context): Unit = {
-    debugId = ctx.settings.YdebugTreeWithId.value
-  }
-}