[[ Bug 20644 ]] Additional comment and test

livecodeali · livecodeali · commit 8eaa95c845a0 · 2017-11-07T20:34:08.000Z
- Add a comment TODO to investigate structs with long doubles on
  x86-64 arch
- Add a test that takes objc_msgSend_stret path on x86-64 arch
diff --git a/libscript/src/script-execute.cpp b/libscript/src/script-execute.cpp
@@ -307,6 +307,8 @@ class MCScriptForeignInvocation
         else
             t_objc_msgSend = (void(*)())objc_msgSend;
 #elif defined(__X86_64__)
+        /* TODO: Investigate structs containing long doubles
+         * as they will not work at the moment */
         if (t_cif->rtype->type == FFI_TYPE_STRUCT &&
             t_rsize > 16)
             t_objc_msgSend = (void(*)())objc_msgSend_stret;
diff --git a/tests/lcb/vm/interop-objc.lcb b/tests/lcb/vm/interop-objc.lcb
@@ -148,4 +148,36 @@ public handler TestReturnNSRange()
 		tRangeList is [1,3]
 end handler
 
+// NSRect is a quadruple of (natural sized) floats
+public foreign type NSRect binds to "MCAggregateTypeInfo:qqqq"
+
+foreign handler NSValueWithRect(in pRect as NSRect) returns ObjcId \
+	binds to "objc:NSValue.+valueWithRect:"
+	
+// NSRect is 32 bytes on 64-bit arch, 16 bytes on 32-bit
+// so will use objc_msgSend_stret on both archs
+foreign handler NSRectFromValue(in pValue as ObjcId) returns NSRect \
+	binds to "objc:NSValue.-rectValue"
+
+public handler TestReturnNSRect()
+	if not the operating system is in ["mac", "ios"] then
+		skip test "return NSRange struct succeeds" because "not implemented on" && the operating system
+		return
+	end if
+	
+	variable tRect as NSRect
+	put [0,0,0,0] into tRect
+	unsafe
+		variable tValue as ObjcId
+		put NSValueWithRect(tRect) into tValue
+		put NSRectFromValue(tValue) into tRect
+	end unsafe
+	
+	variable tRectList as List
+	put tRect into tRectList
+	
+	test "return NSRect struct succeeds" when \
+		tRectList is [0,0,0,0]
+end handler
+
 end module
