Skip to content

Remove dead code for unpickling java repeated #3678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allanrenucci merged 1 commit into from
Dec 19, 2017
Merged

Remove dead code for unpickling java repeated #3678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,24 +944,13 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi
tpd.Super(qual, mixId, ctx.mode.is(Mode.InSuperCall), mixTpe.typeSymbol)
case APPLY =>
val fn = readTerm()
val isJava = fn.symbol.is(JavaDefined)
def readArg() = readTerm() match {
case SeqLiteral(elems, elemtpt) if isJava =>
JavaSeqLiteral(elems, elemtpt)
case arg => arg
}
tpd.Apply(fn, until(end)(readArg()))
tpd.Apply(fn, until(end)(readTerm()))
case TYPEAPPLY =>
tpd.TypeApply(readTerm(), until(end)(readTpt()))
case TYPED =>
Copy link
Member

@smarter smarter Dec 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the use of JavaSeqLiteral in this case be removed too?

val expr = readTerm()
val tpt = readTpt()
val expr1 = expr match {
case SeqLiteral(elems, elemtpt) if tpt.tpe.isRef(defn.ArrayClass) =>
JavaSeqLiteral(elems, elemtpt)
case expr => expr
}
Typed(expr1, tpt)
Typed(expr, tpt)
case ASSIGN =>
Assign(readTerm(), readTerm())
case BLOCK =>
Expand Down