Skip to content

Conversation

@JinShil
Copy link
Contributor

@JinShil JinShil commented Dec 17, 2017

No description provided.

@dlang-bot
Copy link
Contributor

Thanks for your pull request, @JinShil!

Bugzilla references

Auto-close Bugzilla Description
18013 DMD test suite assertion failure in test_cdvecfill.d

]),
);
version(D_PIC)
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned at #7427 (comment) running the update script is really useful and we shouldn't break that. Hence, I think it's best to make a copy of this file for version(D_PIC)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifically, which update script?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The one which can be used to generate this output. Who did you get the -fPIC instructions?
Check the header of this file ;-)

Copy link
Contributor Author

@JinShil JinShil Dec 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I changed the update code to generate either PIC or non-PIC depending on what kind of machine it's run on.

@JinShil
Copy link
Contributor Author

JinShil commented Dec 17, 2017

cc @MartinNowak

@JinShil
Copy link
Contributor Author

JinShil commented Dec 18, 2017

btw, The diff in Github looks really screwy. It's probably easier to just review without the diff.

replaceFirstInto!((_, orng) => formattedWrite(orng, "// dfmt off\n%s// dfmt on", sink.data))(orng, content, ctRegex!(`^// dfmt off[^$]*// dfmt on$`, "m"));
version(D_PIC)
{
replaceFirstInto!((_, orng) => formattedWrite(orng, "// dfmtpic off\n%s// dfmtpic on", sink.data))(orng, content, ctRegex!(`^// dfmtpic off[^$]*// dfmtpic on$`, "m"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ehm I think you need to leave // dfmt off as it's a known directive.
Maybe sth. like:

// PIC\n// dfmt off[^$]*// dfmt off

See also: https://github.com/dlang-community/dfmt#disabling-formatting

Copy link
Contributor Author

@JinShil JinShil Dec 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😆 I thought that was a strange moniker to use. I've updated the code to keep the // dfmt directives and use different strings for the codegen.

Copy link
Contributor

@wilzbach wilzbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. So if @MartinNowak doesn't complain in a few days, I suggest we move forward with this. After all, we want to get the testsuite running with -fPIC ...

@PetarKirov
Copy link
Member

I would strongly prefer if we could include this in the 2.078.0 release, as not being able to run test suite is a regression. Can you change the target of your PR to stable?

@JinShil JinShil changed the base branch from master to stable December 22, 2017 07:46
Copy link
Member

@PetarKirov PetarKirov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and thanks for doing the work @JinShil. I think we should get this in as soon as possible.

@dlang-bot dlang-bot merged commit c145cdc into dlang:stable Dec 22, 2017
@JinShil JinShil deleted the cdvecfill_pic branch December 29, 2017 12:32
@MartinNowak
Copy link
Member

Would have been sufficient to put -fPIC to require args and only keep one branch.

@MartinNowak
Copy link
Member

MartinNowak commented Jan 15, 2018

I was scratching my head like crazy trying to remember when I added this PIC code and more importantly why, see #7716.

dlang-bot added a commit that referenced this pull request Jan 16, 2018
fixup for #7454 - always run asm tests with PIC
merged-on-behalf-of: Mike Franklin <JinShil@users.noreply.github.com>
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.

5 participants