Skip to content

noop merge of 2.10.x to master #116

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 5 commits into from
Jul 7, 2015

Conversation

retronym
Copy link
Member

@retronym retronym commented Jul 7, 2015

Just backports.

retronym added 5 commits July 6, 2015 15:11
…ure[Nothing]

This commit disabled live variable analysis for intermediate values of type Nothing.

Fixes scala#104

(cherry picked from commit 6353443)
[backport] Avoid masking real errors with NotImplemented awaiting Future[Nothing]
During the ANF transform, we were generating a tree of the shape:

   {
     val temp: Unit = await(futureOfUnit)
     temp
     ()
   }

I tried to simplifiy this to avoid creating the temporary value,
but this proved difficult as it would have required changes to
the subsequent state machine transformation.

Even replacing `temp` with `()` made the state machine transform
harder.

So for now, I've just inserted `temp.asInstanceOf[Unit]` to hide
from the compiler warning.

Fixes scala#74

(cherry picked from commit f3f0589)
Avoid compiler warning when awaiting Future[Unit]
retronym added a commit that referenced this pull request Jul 7, 2015
@retronym retronym merged commit 22e876b into scala:master Jul 7, 2015
@retronym retronym added this to the 0.9.4 milestone Jul 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant