Fix values for unarchiver flags; ensure we don’t invoke NSUnsupported() functions here.

millenomi · millenomi · commit 662f0d7613f3 · 2019-04-16T14:50:10.000-07:00
diff --git a/Foundation/NSKeyedUnarchiver.swift b/Foundation/NSKeyedUnarchiver.swift
@@ -30,9 +30,9 @@ open class NSKeyedUnarchiver : NSCoder {
         }
         
         static let none = UnarchiverFlags(rawValue: 0)
-        static let finishedDecoding = UnarchiverFlags(rawValue : 1)
-        static let requiresSecureCoding = UnarchiverFlags(rawValue: 2)
-        static let startedDecoding = UnarchiverFlags(rawValue: 3)
+        static let finishedDecoding = UnarchiverFlags(rawValue : 1 << 0)
+        static let requiresSecureCoding = UnarchiverFlags(rawValue: 1 << 1)
+        static let startedDecoding = UnarchiverFlags(rawValue: 1 << 2)
     }
     
     class DecodingContext {
@@ -79,7 +79,7 @@ open class NSKeyedUnarchiver : NSCoder {
         unarchiver.requiresSecureCoding = true
         unarchiver.decodingFailurePolicy = .setErrorAndReturn
         
-        return try unarchiver.decodeTopLevelObject(of: classes, forKey: NSKeyedArchiveRootObjectKey)
+        return try unarchiver.decodeObject(of: classes, forKey: NSKeyedArchiveRootObjectKey)
     }
     
     @available(swift, deprecated: 9999, renamed: "unarchivedObject(ofClass:from:)")

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ open class NSKeyedUnarchiver : NSCoder {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`static let none = UnarchiverFlags(rawValue: 0)`
`33`		`- static let finishedDecoding = UnarchiverFlags(rawValue : 1)`
`34`		`- static let requiresSecureCoding = UnarchiverFlags(rawValue: 2)`
`35`		`- static let startedDecoding = UnarchiverFlags(rawValue: 3)`
	`33`	`+ static let finishedDecoding = UnarchiverFlags(rawValue : 1 << 0)`
	`34`	`+ static let requiresSecureCoding = UnarchiverFlags(rawValue: 1 << 1)`
	`35`	`+ static let startedDecoding = UnarchiverFlags(rawValue: 1 << 2)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`class DecodingContext {`
`@@ -79,7 +79,7 @@ open class NSKeyedUnarchiver : NSCoder {`
`79`	`79`	`unarchiver.requiresSecureCoding = true`
`80`	`80`	`unarchiver.decodingFailurePolicy = .setErrorAndReturn`
`81`	`81`
`82`		`- return try unarchiver.decodeTopLevelObject(of: classes, forKey: NSKeyedArchiveRootObjectKey)`
	`82`	`+ return try unarchiver.decodeObject(of: classes, forKey: NSKeyedArchiveRootObjectKey)`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@available(swift, deprecated: 9999, renamed: "unarchivedObject(ofClass:from:)")`