Skip to content

[32bits] Update assert on SymbolicValue size #27515

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
merged 1 commit into from
Oct 8, 2019

Conversation

uraimo
Copy link
Contributor

@uraimo uraimo commented Oct 3, 2019

Since the storage is a multiple of uint64_t (following what LLVM's APInt does, copy implemented here) we want to check for 2*uin64_t here, even on 32bit platforms.
Right now, this breaks 5.1 builds on 32bits(arm&co).

Since the storage is a multiple of uint64_t (derived by what LLVM's APInt does) we want to check for 2*uin64_t here, even on 32bit platforms.
@@ -556,7 +556,7 @@ class SymbolicValue {
void dump() const;
};

static_assert(sizeof(SymbolicValue) == 2 * sizeof(void *),
static_assert(sizeof(SymbolicValue) == 2 * sizeof(uint64_t),
"SymbolicValue should stay small");
static_assert(std::is_pod<SymbolicValue>::value,
Copy link
Contributor

Choose a reason for hiding this comment

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

@marcrasi While here, I suggest changing this to is_trivially_copyable or is_trivial or is_standard_layout, whichever is actually being relied upon. See https://en.cppreference.com/w/cpp/named_req/PODType for more details.

Copy link

Choose a reason for hiding this comment

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

I made a PR: #27521

@jrose-apple
Copy link
Contributor

@swift-ci Please smoke test and merge

@uraimo
Copy link
Contributor Author

uraimo commented Oct 4, 2019

Same TestURLSession.test_redirectionWithSetCookies that is failing everywhere else (see PR2532):

18:13:33 Test Case 'TestURLSession.test_redirectionWithSetCookies' started at 2019-10-03 23:13:21.347
18:13:33 
/home/buildnode/jenkins/workspace/swift-PR-Linux-smoke-test/branch-master/swift-corelibs-foundation/TestFoundation/TestURLSession.swift:626: error: TestURLSession.test_redirectionWithSetCookies : XCTAssertNotNil failed - 
18:13:33 /home/buildnode/jenkins/workspace/swift-PR-Linux-smoke-test/branch-master/swift-corelibs-foundation/TestFoundation/TestURLSession.swift:627: error: TestURLSession.test_redirectionWithSetCookies : XCTAssertNil failed: "Error Domain=NSURLErrorDomain Code=-1011 "(null)"" - error = Error Domain=NSURLErrorDomain Code=-1011 "(null)"

@jrose-apple jrose-apple self-assigned this Oct 4, 2019
@jrose-apple
Copy link
Contributor

swiftlang/swift-corelibs-foundation#2532
@swift-ci Please smoke test Linux

@jrose-apple
Copy link
Contributor

@swift-ci Please smoke test Linux

1 similar comment
@jrose-apple
Copy link
Contributor

@swift-ci Please smoke test Linux

@jrose-apple jrose-apple merged commit 4055530 into swiftlang:master Oct 8, 2019
@jrose-apple
Copy link
Contributor

Sorry for the delay!

@uraimo
Copy link
Contributor Author

uraimo commented Oct 8, 2019

No problem 👍

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