Skip to content

Commit 47c92f1

Browse files
tomballantonio-cortes-perez
authored andcommitted
Fixed Xcode 11 atomic-implicit-seq-cst warning with NSString initialization.
Change on 2019/07/11 by tball <[email protected]> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=257674734
1 parent ef242c8 commit 47c92f1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

jre_emul/Classes/J2ObjC_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ J2OBJC_VOLATILE_ACCESS_DEFN(Double, jdouble)
180180
#define J2OBJC_STATIC_INIT(CLASS) \
181181
FOUNDATION_EXPORT _Atomic(jboolean) CLASS##__initialized; \
182182
__attribute__((always_inline)) inline void CLASS##_initialize() { \
183-
if (__builtin_expect(!__c11_atomic_load(&CLASS##__initialized, __ATOMIC_ACQUIRE), 0)) { \
183+
if (!__c11_atomic_load(&CLASS##__initialized, __ATOMIC_ACQUIRE)) { \
184184
[CLASS class]; \
185185
} \
186186
}

jre_emul/Classes/NSString+JavaString.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ FOUNDATION_EXPORT NSString *NSString_java_joinWithJavaLangCharSequence_withJavaL
326326
// Use the category dummy to initialize static variables for the String class.
327327
FOUNDATION_EXPORT _Atomic(jboolean) NSString__initialized;
328328
__attribute__((always_inline)) inline void NSString_initialize() {
329-
if (!__builtin_expect(NSString__initialized, true)) {
329+
if (!__c11_atomic_load(&NSString__initialized, __ATOMIC_ACQUIRE)) {
330330
[JreStringCategoryDummy class];
331331
}
332332
}

0 commit comments

Comments
 (0)