From 094cd9ff3b07536f75f3a233606823ae5478d542 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 7 Mar 2017 13:13:27 +0100
Subject: Fix #2056: Backend crash when inlined method contains try

In various places we do "case EmptyTree =>", since Tree#equals uses
reference equality this means that EmptyTree should never be copied,
otherwise some other code path will be taken.
---
 compiler/src/dotty/tools/dotc/ast/Trees.scala |  7 +++++--
 tests/pos/i2056.scala                         | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 tests/pos/i2056.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala
index 27be8c9d6..669e5429c 100644
--- a/compiler/src/dotty/tools/dotc/ast/Trees.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala
@@ -712,8 +712,11 @@ object Trees {
     override def toList: List[Tree[T]] = flatten(trees)
     override def toString = if (isEmpty) "EmptyTree" else "Thicket(" + trees.mkString(", ") + ")"
     override def withPos(pos: Position): this.type = {
-      val newTrees = trees.map(_.withPos(pos))
-      new Thicket[T](newTrees).asInstanceOf[this.type]
+      val newTrees = trees.mapConserve(_.withPos(pos))
+      if (trees eq newTrees)
+        this
+      else
+        new Thicket[T](newTrees).asInstanceOf[this.type]
     }
     override def pos = (NoPosition /: trees) ((pos, t) => pos union t.pos)
     override def foreachInThicket(op: Tree[T] => Unit): Unit =
diff --git a/tests/pos/i2056.scala b/tests/pos/i2056.scala
new file mode 100644
index 000000000..c4d020fb6
--- /dev/null
+++ b/tests/pos/i2056.scala
@@ -0,0 +1,13 @@
+object Test {
+  inline def crash() = {
+    try {
+      println("hi")
+    } catch {
+      case e: Exception =>
+    }
+  }
+
+  def main(args: Array[String]): Unit = {
+    crash()
+  }
+}
-- 
cgit v1.2.3