summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-19 13:52:26 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-06-19 13:52:26 +0200
commitb3283669e05dc706274e944ffd3750892c16e4dd (patch)
tree13b8ce0c0d997276475c94bcb2b4a4709ebdb5ce /src/compiler
parente9afc2d8a070584d2784aefd63c4b54fe9e1b69b (diff)
parent91b6944480a3b37f1d62a8a2ed3c332ce02a835a (diff)
downloadscala-b3283669e05dc706274e944ffd3750892c16e4dd.tar.gz
scala-b3283669e05dc706274e944ffd3750892c16e4dd.tar.bz2
scala-b3283669e05dc706274e944ffd3750892c16e4dd.zip
Merge commit '91b6944' into merge-2.11-to-2.12-june-19
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
index 1e9a1762eb..7866fcf2dc 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
@@ -107,7 +107,7 @@ abstract class TreeBuilder {
def makeCatchFromExpr(catchExpr: Tree): CaseDef = {
val binder = freshTermName()
val pat = Bind(binder, Typed(Ident(nme.WILDCARD), Ident(tpnme.Throwable)))
- val catchDef = ValDef(Modifiers(ARTIFACT), freshTermName("catchExpr"), TypeTree(), catchExpr)
+ val catchDef = ValDef(Modifiers(ARTIFACT), freshTermName("catchExpr$"), TypeTree(), catchExpr)
val catchFn = Ident(catchDef.name)
val body = atPos(catchExpr.pos.makeTransparent)(Block(
List(catchDef),