8342647: [macosx] Clean up the NSInvocation based call to NSProcessInfo.operatingSystemVersion

Reviewed-by: bchristi

Author: jaikiran

src/java.base/macosx/native/libjava/java_props_macosx.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -222,54 +222,35 @@ char *setupMacOSXLocale(int cat) {
     }
 }
 
-// 10.9 SDK does not include the NSOperatingSystemVersion struct.
-// For now, create our own
-typedef struct {
-        NSInteger majorVersion;
-        NSInteger minorVersion;
-        NSInteger patchVersion;
-} OSVerStruct;
-
 void setOSNameAndVersion(java_props_t *sprops) {
     // Hardcode os_name, and fill in os_version
     sprops->os_name = strdup("Mac OS X");
 
     NSString *nsVerStr = NULL;
     char* osVersionCStr = NULL;
-    // Mac OS 10.9 includes the [NSProcessInfo operatingSystemVersion] function,
-    // but it's not in the 10.9 SDK.  So, call it via NSInvocation.
-    if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)]) {
-        OSVerStruct osVer;
-        NSMethodSignature *sig = [[NSProcessInfo processInfo] methodSignatureForSelector:
-                @selector(operatingSystemVersion)];
-        NSInvocation *invoke = [NSInvocation invocationWithMethodSignature:sig];
-        invoke.selector = @selector(operatingSystemVersion);
-        [invoke invokeWithTarget:[NSProcessInfo processInfo]];
-        [invoke getReturnValue:&osVer];
-
-        // Copy out the char* if running on version other than 10.16 Mac OS (10.16 == 11.x)
-        // or explicitly requesting version compatibility
-        if (!((long)osVer.majorVersion == 10 && (long)osVer.minorVersion >= 16) ||
-                (getenv("SYSTEM_VERSION_COMPAT") != NULL)) {
-            if (osVer.patchVersion == 0) { // Omit trailing ".0"
-                nsVerStr = [NSString stringWithFormat:@"%ld.%ld",
-                        (long)osVer.majorVersion, (long)osVer.minorVersion];
-            } else {
-                nsVerStr = [NSString stringWithFormat:@"%ld.%ld.%ld",
-                        (long)osVer.majorVersion, (long)osVer.minorVersion, (long)osVer.patchVersion];
-            }
+    NSOperatingSystemVersion osVer = [[NSProcessInfo processInfo] operatingSystemVersion];
+    // Copy out the char* if running on version other than 10.16 Mac OS (10.16 == 11.x)
+    // or explicitly requesting version compatibility
+    if (!((long)osVer.majorVersion == 10 && (long)osVer.minorVersion >= 16) ||
+            (getenv("SYSTEM_VERSION_COMPAT") != NULL)) {
+        if (osVer.patchVersion == 0) { // Omit trailing ".0"
+            nsVerStr = [NSString stringWithFormat:@"%ld.%ld",
+                    (long)osVer.majorVersion, (long)osVer.minorVersion];
         } else {
-            // Version 10.16, without explicit env setting of SYSTEM_VERSION_COMPAT
-            // AKA 11+ Read the *real* ProductVersion from the hidden link to avoid SYSTEM_VERSION_COMPAT
-            // If not found, fallback below to the SystemVersion.plist
-            NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
-                             @"/System/Library/CoreServices/.SystemVersionPlatform.plist"];
-            if (version != NULL) {
-                nsVerStr = [version objectForKey : @"ProductVersion"];
-            }
+            nsVerStr = [NSString stringWithFormat:@"%ld.%ld.%ld",
+                    (long)osVer.majorVersion, (long)osVer.minorVersion, (long)osVer.patchVersion];
+        }
+    } else {
+        // Version 10.16, without explicit env setting of SYSTEM_VERSION_COMPAT
+        // AKA 11+ Read the *real* ProductVersion from the hidden link to avoid SYSTEM_VERSION_COMPAT
+        // If not found, fallback below to the SystemVersion.plist
+        NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
+                         @"/System/Library/CoreServices/.SystemVersionPlatform.plist"];
+        if (version != NULL) {
+            nsVerStr = [version objectForKey : @"ProductVersion"];
         }
     }
-    // Fallback if running on pre-10.9 Mac OS
+    // Fallback to reading the SystemVersion.plist
     if (nsVerStr == NULL) {
         NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
                                  @"/System/Library/CoreServices/SystemVersion.plist"];