summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-05-10 17:04:41 -0700
committerPaul Phillips <paulp@improving.org>2012-05-10 17:04:41 -0700
commit2c64dc3b5fb37d540a8e06e3e40075e99d053c0d (patch)
tree982b8fccccceb5dfdc76fb74731f4b181dde1df9 /src/compiler
parent4c04213b991596aa73dec3aa34cb8816a277f538 (diff)
parent9d1bc68b78a76a18777a859816bcb1c7f81bf2dd (diff)
downloadscala-2c64dc3b5fb37d540a8e06e3e40075e99d053c0d.tar.gz
scala-2c64dc3b5fb37d540a8e06e3e40075e99d053c0d.tar.bz2
scala-2c64dc3b5fb37d540a8e06e3e40075e99d053c0d.zip
Merge commit 'refs/pull/526/head' into develop
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/interactive/Global.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index cf80570563..edf0108e58 100644
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -930,7 +930,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
val implicitlyAdded = viaView != NoSymbol
members.add(sym, pre, implicitlyAdded) { (s, st) =>
new TypeMember(s, st,
- context.isAccessible(s, pre, superAccess && !implicitlyAdded),
+ context.isAccessible(if (s.hasGetter) s.getter(s.owner) else s, pre, superAccess && !implicitlyAdded),
inherited,
viaView)
}