Skip to content

Revert Attempted Fix of SR6812 #1727

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.

Sign up for GitHub

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 15, 2018
Merged

Revert Attempted Fix of SR6812 #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions CoreFoundation/Base.subproj/CFRuntime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,19 +194,11 @@ typedef struct __CFRuntimeBase {
// This matches the isa and retain count storage in Swift
uintptr_t _cfisa;
uintptr_t _swift_rc;
// This is for CF's use, and must match _NSCFType layout
#if defined(__LP64__) || defined(__LLP64__)
// This is for CF's use, and must match __NSCFType/_CFInfo layout
Copy link
Contributor

Choose a reason for hiding this comment

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

Just one comment: do we want to move _CFInfo to match (one UInt64 instead of two UInt32s?) @mundaym

Copy link
Contributor

Choose a reason for hiding this comment

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

By which I mean: in this same patch.

Copy link
Contributor Author

@Kaiede Kaiede Oct 15, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I generally try to keep reverts away from other changes, personally. But that comes from a non-git background. In general, this PR, #1694 and #1709 are already getting pretty entangled as it is.

Is the purpose of this PR to unblock ARM32 caused by a regression, or to generally start to fix the underlying issues that caused the regression? If the former, I'd say keep this focused, and then it should be easy to follow up with the other fixes. If the latter, than we should probably have these commits coming in as a group, but then it gets a bit more difficult since I can't really test PPC BE on behalf of @mundaym.

Copy link
Contributor

Choose a reason for hiding this comment

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

Then I’m good with this and let’s figure out the rest step by step.

_Atomic(uint64_t) _cfinfoa;
#else
_Atomic(uint32_t) _cfinfoa;
#endif
} CFRuntimeBase;

#if defined(__LP64__) || defined(__LLP64__)
#define INIT_CFRUNTIME_BASE(...) {0, _CF_CONSTANT_OBJECT_STRONG_RC, 0x0000000000000080ULL}
#else
#define INIT_CFRUNTIME_BASE(...) {0, _CF_CONSTANT_OBJECT_STRONG_RC, 0x00000080UL}
#endif

#else

Expand Down
4 changes: 0 additions & 4 deletions CoreFoundation/String.subproj/CFString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,7 @@ struct __CFConstStr {
struct {
uintptr_t _cfisa;
uintptr_t _swift_rc;
#if defined(__LP64__) || defined(__LLP64__)
uint64_t _cfinfoa;
#else // 32-bit:
uint32_t _cfinfoa;
#endif // defined(__LP64__) || defined(__LLP64__)
} _base;
uint8_t *_ptr;
#if defined(__LP64__) && defined(__BIG_ENDIAN__)
Expand Down