More `align_offset` things#44537

oli-obk · 2017-09-13T10:23:08Z

rust-highfive · 2017-09-13T10:23:19Z

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

alexcrichton · 2017-09-13T14:33:04Z

src/libstd/sys_common/memchr.rs

-        let mut offset;
-        if align > 0 {
-            offset = cmp::min(usize_bytes - align, len);
+        let mut offset = unsafe { align_offset(ptr as *const _, usize_bytes) };


Should this be using the inherent methods added in this PR?

The compiler complained that it doesn't know the unstable feature (on stage0). This would become a mess of cfgs, so I opted to not do this here.

Sounds like a stage0 inherent method on pointers which does the old method via casts and not(stage0) uses the intrinsic?

alexcrichton · 2017-09-13T15:31:18Z

src/libcore/ptr.rs

+    /// remove me after the next release
+    pub fn align_offset(self, align: usize) -> usize {
+        unsafe {
+            intrinsics::align_offset(self as *const _, align)


This looks the same as the above function? I think the #[cfg] in the intrinsics module should be enough?

It differs in the stability. I couldn't use the function within core without giving core the corresponding feature, which then complained about an unknown feature.

I'm not sure I understand this? Can't the stage0 shim in the intrinsics module be just as unstable as the real intrinsic in non-stage0?

I must have misread the error messages I got. It works now without duplicating the inherent methods. The intrinsics are still duplicated.

alexcrichton · 2017-09-14T17:34:17Z

@bors: r+

bors · 2017-09-14T17:34:18Z

📌 Commit 1462cab has been approved by alexcrichton

alexcrichton · 2017-09-16T00:58:34Z

@bors: rollup

More `align_offset` things cc rust-lang#44488

bors · 2017-09-16T22:25:46Z

☔ The latest upstream changes (presumably #43964) made this pull request unmergeable. Please resolve the merge conflicts.

Rollup of 19 pull requests - Successful merges: #44273, #44356, #44395, #44531, #44537, #44542, #44560, #44567, #44574, #44577, #44586, #44589, #44590, #44593, #44598, #44606, #44609, #44616, #44631 - Failed merges:

oli-obk · 2017-09-17T19:48:58Z

Rebased

alexcrichton · 2017-09-17T22:12:41Z

@bors: r+

bors · 2017-09-17T22:12:41Z

📌 Commit 2787a28 has been approved by alexcrichton

More `align_offset` things cc rust-lang#44488

Rollup of 10 pull requests - Successful merges: #44364, #44466, #44537, #44640, #44651, #44657, #44661, #44668, #44671, #44675 - Failed merges:

More `align_offset` things cc rust-lang#44488

Rollup of 11 pull requests - Successful merges: #44364, #44466, #44537, #44548, #44640, #44651, #44657, #44661, #44668, #44671, #44675 - Failed merges:

@oli-obk

make memrchr use align_offset I hope I did not screw that up... Cc @oli-obk who authored the original rust-lang#44537

@oli-obk

make memrchr use align_offset I hope I did not screw that up... Cc @oli-obk who authored the original #44537 Fixes #50567 (thanks @bjorn3)

rust-highfive assigned alexcrichton Sep 13, 2017

oli-obk mentioned this pull request Sep 13, 2017

Windows support in the test suite + appveyor rust-lang/miri#334

Merged

oli-obk force-pushed the memchr branch 2 times, most recently from 3f8abb7 to 18ab95f Compare September 13, 2017 13:31

alexcrichton reviewed Sep 13, 2017

View reviewed changes

aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 13, 2017

alexcrichton mentioned this pull request Sep 16, 2017

Rollup of 27 pull requests #44621

Closed

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Sep 16, 2017

Rollup merge of rust-lang#44537 - oli-obk:memchr, r=alexcrichton

458c805

More `align_offset` things cc rust-lang#44488

frewsxcv mentioned this pull request Sep 16, 2017

Rollup of 25 pull requests #44623

Closed

alexcrichton mentioned this pull request Sep 16, 2017

Rollup of 19 pull requests #44634

Merged

Add <*const T>::align_offset and use it in memchr

2787a28

oli-obk force-pushed the memchr branch from 1462cab to 2787a28 Compare September 17, 2017 19:31

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 18, 2017

Rollup merge of rust-lang#44537 - oli-obk:memchr, r=alexcrichton

1907827

More `align_offset` things cc rust-lang#44488

alexcrichton mentioned this pull request Sep 18, 2017

Rollup of 10 pull requests #44676

Closed

bors added a commit that referenced this pull request Sep 18, 2017

Auto merge of #44676 - alexcrichton:rollup, r=alexcrichton

4a8bc8a

Rollup of 10 pull requests - Successful merges: #44364, #44466, #44537, #44640, #44651, #44657, #44661, #44668, #44671, #44675 - Failed merges:

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 18, 2017

Rollup merge of rust-lang#44537 - oli-obk:memchr, r=alexcrichton

8dae2b0

More `align_offset` things cc rust-lang#44488

alexcrichton mentioned this pull request Sep 18, 2017

Rollup of 11 pull requests #44678

Merged

bors added a commit that referenced this pull request Sep 18, 2017

Auto merge of #44678 - alexcrichton:rollup, r=alexcrichton

0701b37

Rollup of 11 pull requests - Successful merges: #44364, #44466, #44537, #44548, #44640, #44651, #44657, #44661, #44668, #44671, #44675 - Failed merges:

bors merged commit 2787a28 into rust-lang:master Sep 18, 2017

Manishearth mentioned this pull request Sep 21, 2017

#[doc = $expr] in macro silently fails to generate docs #44730

Closed

oli-obk deleted the memchr branch April 11, 2018 13:53

RalfJung mentioned this pull request Jul 26, 2018

make memrchr use align_offset #52744

Merged

bors added a commit that referenced this pull request Jul 28, 2018

Auto merge of #52744 - RalfJung:align_offset, r=Kimundi

d754582

make memrchr use align_offset I hope I did not screw that up... Cc @oli-obk who authored the original #44537 Fixes #50567 (thanks @bjorn3)

Uh oh!

Conversation

oli-obk commented Sep 13, 2017

Uh oh!

rust-highfive commented Sep 13, 2017

Uh oh!

alexcrichton Sep 13, 2017

Choose a reason for hiding this comment

Uh oh!

oli-obk Sep 13, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexcrichton Sep 13, 2017

Choose a reason for hiding this comment

Uh oh!

alexcrichton Sep 13, 2017

Choose a reason for hiding this comment

Uh oh!

oli-obk Sep 13, 2017

Choose a reason for hiding this comment

Uh oh!

alexcrichton Sep 14, 2017

Choose a reason for hiding this comment

Uh oh!

oli-obk Sep 14, 2017

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Sep 14, 2017

Uh oh!

bors commented Sep 14, 2017

Uh oh!

alexcrichton commented Sep 16, 2017

Uh oh!

bors commented Sep 16, 2017

Uh oh!

oli-obk commented Sep 17, 2017

Uh oh!

alexcrichton commented Sep 17, 2017

Uh oh!

bors commented Sep 17, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

oli-obk Sep 13, 2017 •

edited

Loading