Skip to content

https://bugs.swift.org/browse/SR-6812 #1557

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 4 commits into from
May 26, 2018
Merged

https://bugs.swift.org/browse/SR-6812 #1557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3e72a9
https://bugs.swift.org/browse/SR-6812
May 19, 2018
1cf2753
Update CFRuntime.h
chnmrc May 21, 2018
150266c
Update CFString.h
chnmrc May 21, 2018
1b52386
Update CFRuntime.h
chnmrc May 21, 2018
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
8 changes: 8 additions & 0 deletions CoreFoundation/Base.subproj/CFRuntime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,18 @@ typedef struct __CFRuntimeBase {
uintptr_t _cfisa;
uintptr_t _swift_rc;
// This is for CF's use, and must match _NSCFType layout
#if __LP64__
Copy link
Contributor

Choose a reason for hiding this comment

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

Presumably LLP64, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, for Windows also, maybe we must add an || condition.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the .c file was updated but not the .h file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is that a question to me?

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

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