Skip to content
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

Jump to bottom

Fix include!()s inside asm!() invocations #34816

Merged
merged 2 commits into from
Jul 16, 2016
Merged

Fix include!()s inside asm!() invocations #34816

merged 2 commits into from
Jul 16, 2016

Conversation

jseyfried
Copy link
Contributor

Fixes #34812, a regression caused by #33749 that was not fixed in #34450.
r? @nrc

@jseyfried
Copy link
Contributor Author

cc @Ericson2314

@nrc
Copy link
Member

nrc commented Jul 15, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 15, 2016

📌 Commit 11f24a9 has been approved by nrc

@bors
Copy link
Contributor

bors commented Jul 16, 2016

⌛ Testing commit 11f24a9 with merge eb196dc...

bors added a commit that referenced this pull request Jul 16, 2016
@bors
Auto merge of #34816 - jseyfried:fix_include_path, r=nrc
eb196dc 
Fix `include!()`s inside `asm!()` invocations

Fixes #34812, a regression caused by #33749 that was not fixed in #34450.
r? @nrc
@bors
Copy link
Contributor

bors commented Jul 16, 2016

☀️ 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
Approved by: nrc
Pushing eb196dc to master...

@bors bors merged commit 11f24a9 into rust-lang:master Jul 16, 2016
@jseyfried jseyfried deleted the fix_include_path branch July 16, 2016 17:46
@jseyfried
Copy link
Contributor Author

jseyfried commented Jul 21, 2016 •
edited
Loading

@nrc I think we'll want to backport this to beta.

@nrc nrc added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 25, 2016
@nikomatsakis
Copy link
Contributor

@jseyfried is this specific to asm!, or a problem that could affect other macros?

If the former, there is no reason to backport since asm! is only usable on nightly anyhow.

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 28, 2016
@nikomatsakis
Copy link
Contributor

Added beta-accepted on the assumption that is indeed a problem more general than asm!

@jseyfried
Copy link
Contributor Author

@nikomatsakis This also applies to env!(include!("...")), which is stable but seems highly unlikely in the wild.

@alexcrichton alexcrichton mentioned this pull request Aug 1, 2016
Merged
@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

include! uses the wrong search path when it is inside an asm! macro invocation
5 participants
@jseyfried @nrc @bors @nikomatsakis @brson