Skip to content

Fix layering violation I introduced by putting _EmptyBoxStorage into the stubs library #10373

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

Merged

Conversation

aschwaighofer
Copy link
Contributor

Should fix the linkage issue on linux

…the stubs library

Should fix the linkage issue on linux
@aschwaighofer
Copy link
Contributor Author

@swift-ci Please smoke test


swift::HeapLocalVariableMetadata _emptyBoxStorageMetadata;

/// The signleton empty box storage object.
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo: singleton

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

swift::HeapLocalVariableMetadata _emptyBoxStorageMetadata;

/// The signleton empty box storage object.
struct _SwiftEmptyBoxStorage _EmptyBoxStorage = {
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this need to be exported or not? If so, it should probably be SWIFT_RUNTIME_STDLIB_INTERFACE; if not, it should probably be in an anonymous namespace.

(Also, no need for the struct 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.

No this does not need to be exported.

@aschwaighofer
Copy link
Contributor Author

@swift-ci Please smoke test

@aschwaighofer aschwaighofer merged commit 62c1f21 into swiftlang:master Jun 19, 2017
aschwaighofer added a commit to aschwaighofer/swift that referenced this pull request Jun 20, 2017
…the stubs library (swiftlang#10373)

* Fix layering violation I introduced by putting _EmptyBoxStorage into the stubs library

Should fix the linkage issue on linux
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.

2 participants