From 6251657d25c4210f98be5679cb433e7db988fa77 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 17 Nov 2017 16:03:00 +0100 Subject: [PATCH 1/2] Upgrade ASM to 6.0, fix bug with very large methods Adapted from https://github.com/scala/scala/pull/6180 by Lukas Rytz, the test case demonstrates that https://github.com/scala/bug/issues/10594 is fixed. The test case is put in tests/run-no-optimise because the optimiser runs forever on this code. --- project/Build.scala | 2 +- tests/run-no-optimise/t10594.scala | 132 +++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 tests/run-no-optimise/t10594.scala diff --git a/project/Build.scala b/project/Build.scala index 56f49ae7dd31..b04265188c67 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -435,7 +435,7 @@ object Build { }.taskValue, // Used by the backend - libraryDependencies += "org.scala-lang.modules" % "scala-asm" % "5.2.0-scala-2", + libraryDependencies += "org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1", // set system in/out for repl connectInput in run := true, diff --git a/tests/run-no-optimise/t10594.scala b/tests/run-no-optimise/t10594.scala new file mode 100644 index 000000000000..9c9ea0eb2713 --- /dev/null +++ b/tests/run-no-optimise/t10594.scala @@ -0,0 +1,132 @@ +class C { + var x = 0 + + def m(): Unit = x += 1 + + def t(b: Boolean): Unit = { + if (b) { + m() + } + + if (b) { + // 10*100 invocations + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 1k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 2k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 3k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 4k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 5k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 6k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 7k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 8k + + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m();m() + // 8200 + m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m() + m();m();m();m();m();m();m();m();m();m() + // 8270 + m();m() + // 8272 + } + } +} + +object Test { + def main(args: Array[String]): Unit = { + val c = new C + c.t(true) + assert(c.x == 8273) + } +} From 2761b63442b684b8ee4840553ae08b4b7b68f3b8 Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Fri, 17 Nov 2017 16:36:04 +0100 Subject: [PATCH 2/2] Update Drone Docker image --- .drone.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index bf0f60506a29..b4e820baa37f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,14 +15,14 @@ pipeline: # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict test_legacy: group: test - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 commands: - cp -R . /tmp/0/ && cd /tmp/0/ - ./project/scripts/sbt legacyTests test: group: test - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 commands: - cp -R . /tmp/1/ && cd /tmp/1/ - ./project/scripts/sbt ";compile ;testAll" @@ -30,7 +30,7 @@ pipeline: test_bootstrapped: group: test - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 commands: - cp -R . /tmp/2/ && cd /tmp/2/ - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/testAll" @@ -38,14 +38,14 @@ pipeline: test_optimised: group: test - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 commands: - cp -R . /tmp/3/ && cd /tmp/3/ - ./project/scripts/sbt dotty-optimised/testAll test_sbt: group: test - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 commands: - cp -R . /tmp/4/ && cd /tmp/4/ - ./project/scripts/sbt sbt-dotty/scripted @@ -55,7 +55,7 @@ pipeline: # DOCUMENTATION: documentation: - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 commands: - ./project/scripts/genDocs secrets: [ bot_pass ] @@ -67,7 +67,7 @@ pipeline: # PUBLISHING: # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala publish_nightly: - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 environment: - NIGHTLYBUILD=yes commands: @@ -80,7 +80,7 @@ pipeline: environment: nightly publish_release: - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 environment: - RELEASEBUILD=yes commands: @@ -106,7 +106,7 @@ pipeline: event: tag publish_sbt_release: - image: lampepfl/dotty:2017-10-20 + image: lampepfl/dotty:2017-11-17 environment: - RELEASEBUILD=yes commands: