From 2a9d910d9a25b990b351a93b0a0c16f6c167cefc Mon Sep 17 00:00:00 2001 From: Evan Wilde Date: Fri, 15 Oct 2021 23:16:45 -0700 Subject: [PATCH 1/2] Revert "Update CFAttributedString.c" This reverts commit 0e157a4d9e7d84ee769d5b95afe4ca9e4f7e690e. --- CoreFoundation/String.subproj/CFAttributedString.c | 1 - 1 file changed, 1 deletion(-) diff --git a/CoreFoundation/String.subproj/CFAttributedString.c b/CoreFoundation/String.subproj/CFAttributedString.c index 14233dfb3b..a1e52e9b92 100644 --- a/CoreFoundation/String.subproj/CFAttributedString.c +++ b/CoreFoundation/String.subproj/CFAttributedString.c @@ -24,7 +24,6 @@ #endif #if defined(__linux__) -// SR-15302: clang mis-optimizes `CFAttributedStringGetAttributesAndLongestEffectiveRange` #pragma clang optimize off #endif From 02c9eaac3669b7f7faf99f9a026a7d3bd2c419e6 Mon Sep 17 00:00:00 2001 From: Evan Wilde Date: Fri, 15 Oct 2021 23:16:52 -0700 Subject: [PATCH 2/2] Revert "CoreFoundation: add a workaround for Linux with the rebranch" This reverts commit 67eb2235684a6b31bdc30aa02995946ab5a3d663. --- CoreFoundation/String.subproj/CFAttributedString.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CoreFoundation/String.subproj/CFAttributedString.c b/CoreFoundation/String.subproj/CFAttributedString.c index a1e52e9b92..cc33885d7e 100644 --- a/CoreFoundation/String.subproj/CFAttributedString.c +++ b/CoreFoundation/String.subproj/CFAttributedString.c @@ -23,10 +23,6 @@ @end #endif -#if defined(__linux__) -#pragma clang optimize off -#endif - struct __CFAttributedString { CFRuntimeBase base; CFStringRef string;