Merge pull request swiftlang#18763 from aschwaighofer/use_jsonencoder_workaround_on_arm

Author: swift-ci

stdlib/public/SDK/Foundation/JSONEncoder.swift

@@ -17,7 +17,7 @@
 /// runtime when running on i386 simulator. The issue is tracked in https://bugs.swift.org/browse/SR-8276
 /// Making the protocol `internal` instead of `fileprivate` works around this issue.
 /// Once SR-8276 is fixed, this check can be removed and the protocol always be made fileprivate.
-#if arch(i386) && targetEnvironment(simulator)
+#if arch(i386) || arch(arm)
 internal protocol _JSONStringDictionaryEncodableMarker { }
 #else
 fileprivate protocol _JSONStringDictionaryEncodableMarker { }
@@ -32,7 +32,7 @@ extension Dictionary : _JSONStringDictionaryEncodableMarker where Key == String,
 /// which is needed for the implementation of the key conversion strategy exemption.
 ///
 /// NOTE: Please see comment above regarding SR-8276
-#if arch(i386) && targetEnvironment(simulator)
+#if arch(i386) || arch(arm)
 internal protocol _JSONStringDictionaryDecodableMarker {
     static var elementType: Decodable.Type { get }
 }

test/stdlib/TestJSONEncoder.swift

@@ -10,9 +10,6 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
-// SR-8276
-// XFAIL: CPU=armv7k
-
 import Swift
 import Foundation