Skip to content

Fix primitive operations on Long with Float #7435

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.

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
merged 1 commit into from
Dec 4, 2018
Merged
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,12 @@ abstract class BTypes {
}

case LONG =>
if (other.isIntegralType) LONG
else if (other.isRealType) DOUBLE
else uncomparable
other match {
case INT | BYTE | LONG | CHAR | SHORT => LONG
case DOUBLE => DOUBLE
case FLOAT => FLOAT
case _ => uncomparable
}

case FLOAT =>
if (other == DOUBLE) DOUBLE
Expand Down