Skip to content

Revert "Remove the return_address intrinsic." - #34580

Merged
bors merged 1 commit into
rust-lang:masterfrom
eddyb:two-steps-forward-one-step-backwards
Jul 3, 2016
Merged

Revert "Remove the return_address intrinsic."#34580
bors merged 1 commit into
rust-lang:masterfrom
eddyb:two-steps-forward-one-step-backwards

Conversation

@eddyb

@eddyb eddyb commented Jun 30, 2016

Copy link
Copy Markdown
Contributor

This reverts commit b30134d.

Servo might want this merged if they don't merge servo/servo#11872 soon.

cc @pnkfelix @jdm

@rust-highfive

rust-highfive commented Jun 30, 2016

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@eddyb

eddyb commented Jun 30, 2016

Copy link
Copy Markdown
Contributor Author

@bors r=nagisa

@bors

bors commented Jun 30, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit f698cd3 has been approved by nagisa

@bors

bors commented Jul 1, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f698cd3 with merge e010787...

@bors

bors commented Jul 1, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-msvc-64-opt-rustbuild

@eddyb

eddyb commented Jul 1, 2016

Copy link
Copy Markdown
Contributor Author

@bors retry

@bors

bors commented Jul 1, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f698cd3 with merge d118de8...

@bors

bors commented Jul 1, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-msvc-64-opt-rustbuild

@alexcrichton

alexcrichton commented Jul 1, 2016

Copy link
Copy Markdown
Member

@bors: retry

On Fri, Jul 1, 2016 at 6:22 AM, bors notifications@github.com wrote:

💔 Test failed - auto-win-msvc-64-opt-rustbuild
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt-rustbuild/builds/1637

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#34580 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AAD95An8KJANVqfH941BeNBJeIowDrjqks5qRRR4gaJpZM4JCb16
.

@nikomatsakis nikomatsakis mentioned this pull request Jul 1, 2016
Merged
@bors

bors commented Jul 3, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f698cd3 with merge 45c3a50...

bors added a commit that referenced this pull request Jul 3, 2016
@bors
Auto merge of #34580 - eddyb:two-steps-forward-one-step-backwards, r=…
45c3a50 
…nagisa

Revert "Remove the return_address intrinsic."

This reverts commit b30134d.

Servo might want this merged if they don't merge servo/servo#11872 soon.

cc @pnkfelix @jdm
@bors

bors commented Jul 3, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors
bors merged commit f698cd3 into rust-lang:master Jul 3, 2016
@eddyb
eddyb deleted the two-steps-forward-one-step-backwards branch July 3, 2016 05:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakis nikomatsakis

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@eddyb @rust-highfive @bors @alexcrichton @nikomatsakis