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.

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

std.regex: Alignment hotfix #6185

Merged
merged 1 commit into from
Feb 16, 2018
Merged

std.regex: Alignment hotfix #6185

merged 1 commit into from
Feb 16, 2018

Conversation

kinke
Copy link
Contributor

@kinke kinke commented Feb 15, 2018

This fixes the unittests for LDC on ARM (with enabled optimizations).

The code used to store a class instance (whose size isn't padded) right before some buffer, without any padding inbetween. The buffer is thus susceptible to misalignment; e.g., BacktrackingMatcher.dupTo() casts the buffer from void[] to size_t[] (in initExternalMemory()), simply assuming an alignment >= size_t.alignof, which only holds if the prepended class instance size is a multiple of that (as malloc() returns a sufficiently aligned block already in this case).

This fixes the unittests for LDC on ARM (with enabled optimizations).

The code used to store a class instance (whose size isn't padded) right
before some buffer, without any padding inbetween. The buffer is thus
susceptible to misalignment; e.g., `BacktrackingMatcher.dupTo()` casts
the buffer from `void[]` to `size_t[]` (in `initExternalMemory()`),
simply assuming an alignment >= `size_t.alignof`, which only holds if
the prepended class instance size is a multiple of that (as `malloc()`
returns a sufficiently aligned block already in this case).
@dlang-bot
Copy link
Contributor

Thanks for your pull request and interest in making D better, @kinke! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please verify that your PR follows this checklist:

  • My PR is fully covered with tests (you can see the annotated coverage diff directly on GitHub with CodeCov's browser extension
  • My PR is as minimal as possible (smaller, focused PRs are easier to review than big ones)
  • I have provided a detailed rationale explaining my changes
  • New or modified functions have Ddoc comments (with Params: and Returns:)

Please see CONTRIBUTING.md for more information.


If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment.

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

@joakim-noah
Copy link
Contributor

The recent std.regex redesign in #5722 introduced this change that broke many tests on ARM. @DmitryOlshansky, this fixes it for me on Android/ARM.

@DmitryOlshansky
Copy link
Member

The recent std.regex redesign in #5722 introduced this change that broke many tests on ARM. @DmitryOlshansky, this fixes it for me on Android/ARM.

LGTM. Indeed it ddin't occur to me that class instance size != align instance size. I think for structs it accounts for that.

@DmitryOlshansky
Copy link
Member

@kinke I think there could be more uses of classInstanceSize, might be worth it to double check.

@dlang-bot dlang-bot merged commit 72bae0b into dlang:master Feb 16, 2018
@kinke kinke deleted the regexAlignment branch February 16, 2018 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants