diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-26 13:22:33 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-26 13:22:33 +0100 |
| commit | 6372df754ca8943a5fea3455936dbb6c1723d78e (patch) | |
| tree | 65354825353c927cbbb6bc7700a1fd4fc7c3982e /src | |
| parent | 439b3eb6a733cd0a274c7d5498d918bce946f8d3 (diff) | |
| parent | 06e7e342d1e27097df0b9d0b31a322fd1cf0a34e (diff) | |
| download | scala-6372df754ca8943a5fea3455936dbb6c1723d78e.tar.gz scala-6372df754ca8943a5fea3455936dbb6c1723d78e.tar.bz2 scala-6372df754ca8943a5fea3455936dbb6c1723d78e.zip | |
Merge pull request #4361 from retronym/ticket/9182
SI-9182 Fix runtime reflection with package object, overloads
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/runtime/SymbolLoaders.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/runtime/SymbolLoaders.scala b/src/reflect/scala/reflect/runtime/SymbolLoaders.scala index 50ea8d9868..9ce6331e33 100644 --- a/src/reflect/scala/reflect/runtime/SymbolLoaders.scala +++ b/src/reflect/scala/reflect/runtime/SymbolLoaders.scala @@ -107,7 +107,8 @@ private[reflect] trait SymbolLoaders { self: SymbolTable => if (isCompilerUniverse) super.enter(sym) else { val existing = super.lookupEntry(sym.name) - assert(existing == null || existing.sym.isMethod, s"pkgClass = $pkgClass, sym = $sym, existing = $existing") + def eitherIsMethod(sym1: Symbol, sym2: Symbol) = sym1.isMethod || sym2.isMethod + assert(existing == null || eitherIsMethod(existing.sym, sym), s"pkgClass = $pkgClass, sym = $sym, existing = $existing") super.enter(sym) } } |