diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2017-03-03 10:34:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 10:34:09 +0100 |
| commit | f77139532d5b6030eaa69a6ff9ed07e7ea4a4dfe (patch) | |
| tree | 828b5e90a990d04eb9cecfa3b3bf4e2ca1605a14 /src/reflect/scala | |
| parent | 96a7617eb6c90f8891eb39f20a7f41a745a8e195 (diff) | |
| parent | ad13063058b3492ecaf806376b75fa206c161b4a (diff) | |
| download | scala-f77139532d5b6030eaa69a6ff9ed07e7ea4a4dfe.tar.gz scala-f77139532d5b6030eaa69a6ff9ed07e7ea4a4dfe.tar.bz2 scala-f77139532d5b6030eaa69a6ff9ed07e7ea4a4dfe.zip | |
Merge pull request #5671 from retronym/topic/stubby-2
Avoid compiler crash with missing transitive dependencies
Diffstat (limited to 'src/reflect/scala')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/pickling/UnPickler.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 890a5796e9..9d71136fc5 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -809,7 +809,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => final def isDerivedValueClass = isClass && !hasFlag(PACKAGE | TRAIT) && - info.firstParent.typeSymbol == AnyValClass && !isPrimitiveValueClass + !phase.erasedTypes && info.firstParent.typeSymbol == AnyValClass && !isPrimitiveValueClass final def isMethodWithExtension = isMethod && owner.isDerivedValueClass && !isParamAccessor && !isConstructor && !hasFlag(SUPERACCESSOR) && !isMacro && !isSpecialized diff --git a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala index 08ccac8069..b4152c9b8c 100644 --- a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala +++ b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala @@ -377,7 +377,7 @@ abstract class UnPickler { def readThisType(): Type = { val sym = readSymbolRef() match { - case stub: StubSymbol => stub.setFlag(PACKAGE) + case stub: StubSymbol => stub.setFlag(PACKAGE | MODULE) case sym => sym } ThisType(sym) |