diff options
| author | Paul Phillips <paulp@improving.org> | 2013-08-20 08:44:03 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-08-20 08:44:03 -0700 |
| commit | 01f771e687291803da1983bdac97d9288c069bfe (patch) | |
| tree | 5c0e664803a9682bb25c6b48658d0660d9727a02 /src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala | |
| parent | 6d4e71c111226591a4eeb5b77efac689ef1dd79a (diff) | |
| parent | 1df7b32a15bac0c57d4371b6e081f06d9e145aaf (diff) | |
| download | scala-01f771e687291803da1983bdac97d9288c069bfe.tar.gz scala-01f771e687291803da1983bdac97d9288c069bfe.tar.bz2 scala-01f771e687291803da1983bdac97d9288c069bfe.zip | |
Merge branch 'master' into patmat
Conflicts:
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala b/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala index 921c3ca1b5..942aa80c34 100644 --- a/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala +++ b/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala @@ -597,9 +597,8 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging { t.symbol.owner = currentOwner case d : DefTree if (d.symbol != NoSymbol) && ((d.symbol.owner == NoSymbol) || (d.symbol.owner == origOwner)) => // don't indiscriminately change existing owners! (see e.g., pos/t3440, pos/t3534, pos/unapplyContexts2) debug.patmat("def: "+ ((d, d.symbol.ownerChain, currentOwner.ownerChain))) - if(d.symbol.moduleClass ne NoSymbol) - d.symbol.moduleClass.owner = currentOwner + d.symbol.moduleClass andAlso (_.owner = currentOwner) d.symbol.owner = currentOwner // case _ if (t.symbol != NoSymbol) && (t.symbol ne null) => debug.patmat("untouched "+ ((t, t.getClass, t.symbol.ownerChain, currentOwner.ownerChain))) |