Support Xcode 11's directory hierarchy #18463

Author: Mike Richter

Source/class-dump.m

@@ -613,14 +613,16 @@ int main(int argc, char *argv[])
 static NSString *resolveFrameworkRoot(NSFileManager *fileManager,
                                       NSString *const sdkRoot) {
 
-    NSString *platformsString = @"Platforms";
-    NSRange range = [sdkRoot rangeOfString:platformsString];
+    NSRange range = [sdkRoot rangeOfString:@"/Platforms/"];
     if (range.location != NSNotFound) {
-        NSString *platforms = [sdkRoot substringToIndex:(range.location + platformsString.length)];
-        NSString *root = [platforms stringByAppendingString:@"/iPhoneOS.platform/Developer/Library/CoreSimulator/"
-                                    @"Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot"];
-        if ([fileManager fileExistsAtPath:root]) {
-            return root;
+        // In Xcode 11, the directories were reordered. Prefer the Xcode 11 order.
+        NSUInteger start = range.location + range.length;
+        for (NSString *simulator in [NSArray arrayWithObjects:@"iPhoneOS.platform/Library/Developer", @"iPhoneOS.platform/Developer/Library", nil]) {
+            NSString *candidate = [simulator stringByAppendingString:@"/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot"];
+            NSString *root = [sdkRoot stringByReplacingCharactersInRange:NSMakeRange(start, [sdkRoot length] - start) withString:candidate];
+            if ([fileManager fileExistsAtPath:root]) {
+                return root;
+            }
         }
     }