JDK-8253839: Do not use objc_msgSend_stret

ZULU-17145

Author: AntonKozlov

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

@@ -222,23 +222,42 @@ 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");
 
     char* osVersionCStr = NULL;
-    // Mac OS 10.2 includes the [NSProcessInfo operatingSystemVersionString] function,
-    // but it's not in the 10.2 SDK.  So, call it via objc_msgSend_stret.
-    if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersionString)]) {
-        NSString* (*procInfoFn)(id rec, SEL sel) = (NSString* (*)(id, SEL))objc_msgSend;
-        NSString *nsVerStr = procInfoFn([NSProcessInfo processInfo],
-                                       @selector(operatingSystemVersionString));
-        if (nsVerStr != NULL) {
-            // Copy out the char*
-            osVersionCStr = strdup([nsVerStr UTF8String]);
+    // 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];
+
+        NSString *nsVerStr;
+        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];
         }
+        // Copy out the char*
+        osVersionCStr = strdup([nsVerStr UTF8String]);
     }
-    // Fallback if running on pre-10.2 Mac OS
+    // Fallback if running on pre-10.9 Mac OS
     if (osVersionCStr == NULL) {
         NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
                                  @"/System/Library/CoreServices/SystemVersion.plist"];