Skip to content

[upstream-update] Do not specify OpenFlags since it was removed upstr… #18472

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

Conversation

gottesmm
Copy link
Contributor

@gottesmm gottesmm commented Aug 2, 2018

…eam.

This was removed upstream in https://reviews.llvm.org/D47789 since the only
place this flag was used was in the windows implementation where the behavior
triggered by this could be hidden in the implementation instead of being an
argument. As such, this code doesn't compile on master-next.

Since this has an acceptable default argument given the current stable, we can
just fix this on master and everything will work.

rdar://42862352

@gottesmm gottesmm requested a review from jrose-apple August 2, 2018 17:32
@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

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

No, you have to remove it from all callers too.

@gottesmm gottesmm force-pushed the pr-e32569f4f04c02ff378bcf2514fc38fcff9253b9 branch from 80a6ce1 to 66c0b3c Compare August 2, 2018 17:45
@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@jrose-apple done.

@gottesmm gottesmm force-pushed the pr-e32569f4f04c02ff378bcf2514fc38fcff9253b9 branch from 66c0b3c to 36b5fd3 Compare August 2, 2018 18:29
Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

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

Thanks! Sorry for the poor communication.

@@ -322,8 +322,8 @@ static bool atomicallyWritingToTextFile(

bool actionFailed = false;
std::error_code EC =
swift::atomicallyWritingToFile(outputPath, /*binary*/false,
[&](llvm::raw_pwrite_stream &out) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Indentation got messed up here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

llvm style I think would say that it should be two. That being said. I am fine fixing it in a subsequent commit.

Copy link
Contributor

Choose a reason for hiding this comment

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

Heh. I looked for it, actually, and they don't say anything about what to do when wrapping lines. I thought clang-format double-indented wrapped lines, but I might be misremembering.

@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

1 similar comment
@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

Or I'll just fix it real quick

…eam.

This was removed upstream in https://reviews.llvm.org/D47789 since the only
place this flag was used was in the windows implementation where the behavior
triggered by this could be hidden in the implementation instead of being an
argument. As such, this code doesn't compile on master-next.

Since this has an acceptable default argument given the current stable, we can
just fix this on master and everything will work.

rdar://42862352
@gottesmm gottesmm force-pushed the pr-e32569f4f04c02ff378bcf2514fc38fcff9253b9 branch from 36b5fd3 to 7e70389 Compare August 2, 2018 18:35
@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

5 similar comments
@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

@gottesmm
Copy link
Contributor Author

gottesmm commented Aug 2, 2018

@swift-ci smoke test and merge

@swift-ci swift-ci merged commit 64c4ae6 into swiftlang:master Aug 2, 2018
@gottesmm gottesmm deleted the pr-e32569f4f04c02ff378bcf2514fc38fcff9253b9 branch August 2, 2018 19:57
lorentey added a commit that referenced this pull request Mar 31, 2021
https://reviews.llvm.org/D97785 reintroduced a flags parameter to `fs::createUniqueFile`, this time preceding `params`. (Compare: #18472)

rdar://76036856
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants