From 5af2bf54d21ac63236cd6e68586b2c38fa0f28c3 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 22 Mar 2012 23:23:02 -0700 Subject: Revert "Made changeOwner more robust; now also deals with return expressions." This reverts commit 19a48510c2e18430a35319c04dfe3bad7119f23f. --- src/compiler/scala/reflect/internal/Trees.scala | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/compiler/scala/reflect/internal/Trees.scala b/src/compiler/scala/reflect/internal/Trees.scala index 1a40e0105c..ac2147d284 100644 --- a/src/compiler/scala/reflect/internal/Trees.scala +++ b/src/compiler/scala/reflect/internal/Trees.scala @@ -324,14 +324,10 @@ trait Trees extends api.Trees { self: SymbolTable => } class ChangeOwnerTraverser(val oldowner: Symbol, val newowner: Symbol) extends Traverser { - def changeOwner(tree: Tree) = tree match { - case Return(expr) => - if (tree.symbol == oldowner) - tree.symbol = newowner - case _: DefTree | _: Function => - if (tree.symbol != NoSymbol && tree.symbol.owner == oldowner) - tree.symbol.owner = newowner - case _ => + def changeOwner(tree: Tree) = { + if ((tree.isDef || tree.isInstanceOf[Function]) && + tree.symbol != NoSymbol && tree.symbol.owner == oldowner) + tree.symbol.owner = newowner } override def traverse(tree: Tree) { changeOwner(tree) -- cgit v1.2.3