Merge pull request #429 from xamarin/rename-NominalRetain

stephen-hawley · web-flow · commit e1807ea16626 · 2020-09-03T10:21:58.000-04:00
renamed RetainNominalData and ReleaseNominalData
diff --git a/SwiftReflector/MarshalEngine.cs b/SwiftReflector/MarshalEngine.cs
@@ -1092,7 +1092,7 @@ CSBaseExpression MarshalTupleAsPointer (BaseDeclaration typeContext, FunctionDec
 				// StructMarshal.Marshaler.ToSwiftTuple(typeof(pType), pName, tupleIntPtr, map)
 				// ...
 				// SomePInvoke(... tupleIntPtr ...)
-				// StructMarshal.Marshaler.ReleaseNominalData (typeof (pType), tupleIntPtr);
+				// StructMarshal.Marshaler.NominalDestroy (typeof (pType), tupleIntPtr);
 				// only injected if the argument is by reference
 				// p.Name = StructMarshal.Marshaler.ToNetTuple<t1, t2, t3, t4>(tupleIntPtr, map);
 				// }
@@ -1127,7 +1127,7 @@ CSBaseExpression MarshalTupleAsPointer (BaseDeclaration typeContext, FunctionDec
 				preMarshalCode.Add (pPtrDecl);
 
 				if (!MarshalingConstructor) {
-					var releaseNominal = CSFunctionCall.FunctionCallLine ("StructMarshal.Marshaler.ReleaseNominalData", false, p.CSType.Typeof (), pPtr);
+					var releaseNominal = CSFunctionCall.FunctionCallLine ("StructMarshal.Marshaler.NominalDestroy", false, p.CSType.Typeof (), pPtr);
 					postMarshalCode.Add (releaseNominal);
 				}
 
diff --git a/SwiftReflector/NewClassCompiler.cs b/SwiftReflector/NewClassCompiler.cs
@@ -3566,7 +3566,7 @@ void ImplementNominalIDisposable (CSClass cl, CSUsingPackages use)
 			//		{
 			//			fixed (byte* p = SwiftData)
 			//			{
-			//				StructMarshal.Marshaler.ReleaseNominalData(typeof(this), p);
+			//				StructMarshal.Marshaler.NominalDestroy(typeof(this), p);
 			//			}
 			//			SwiftData = null;
 			//		}
@@ -3583,7 +3583,7 @@ void ImplementNominalIDisposable (CSClass cl, CSUsingPackages use)
 			var fixedBody = new CSCodeBlock ();
 			var fixedBlock = new CSFixedCodeBlock (CSSimpleType.ByteStar, bytestarID, swiftDataID, fixedBody);
 			use.AddIfNotPresent (typeof (StructMarshal));
-			fixedBlock.Add (CSFunctionCall.FunctionCallLine ("StructMarshal.Marshaler.ReleaseNominalData", false,
+			fixedBlock.Add (CSFunctionCall.FunctionCallLine ("StructMarshal.Marshaler.NominalDestroy", false,
 			                                               new CSFunctionCall ("typeof", false, new CSIdentifier (cl.ToCSType ().ToString ())),
 			                                               bytestarID));
 
diff --git a/SwiftRuntimeLibrary/BaseAssociatedTypeProxy.cs b/SwiftRuntimeLibrary/BaseAssociatedTypeProxy.cs
@@ -27,7 +27,7 @@ protected BaseAssociatedTypeProxy (byte [] swiftTypeData, SwiftMetatype mt)
 			if (swiftTypeData == null)
 				throw new ArgumentNullException (nameof (swiftTypeData));
 			var length = swiftTypeData.Length;
-			StructMarshal.Marshaler.RetainNominalData (mt, swiftTypeData);
+			StructMarshal.Marshaler.NominalInitializeWithCopy (mt, swiftTypeData);
 			SwiftData = new byte [length];
 			Array.Copy (swiftTypeData, SwiftData, length);
 			ProxiedMetatype = mt;
@@ -61,7 +61,7 @@ protected virtual void DisposeUnmanagedResources ()
 			if (IsCSObjectProxy) {
 				SwiftCore.Release (SwiftObject);
 			} else {
-				StructMarshal.Marshaler.ReleaseNominalData (ProxiedMetatype, SwiftData);
+				StructMarshal.Marshaler.NominalDestroy (ProxiedMetatype, SwiftData);
 			}
 		}
 
diff --git a/SwiftRuntimeLibrary/SwiftArray.cs b/SwiftRuntimeLibrary/SwiftArray.cs
@@ -147,7 +147,7 @@ public void Dispose ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 			
 		public IEnumerator<T> GetEnumerator ()
diff --git a/SwiftRuntimeLibrary/SwiftCharacter.cs b/SwiftRuntimeLibrary/SwiftCharacter.cs
@@ -72,7 +72,7 @@ public unsafe override string ToString ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 	}
 }
diff --git a/SwiftRuntimeLibrary/SwiftDate.cs b/SwiftRuntimeLibrary/SwiftDate.cs
@@ -99,7 +99,7 @@ void Dispose (bool disposing)
 			if (SwiftData != null) {
 				unsafe {
 					fixed (byte* p = SwiftData) {
-						StructMarshal.Marshaler.ReleaseNominalData (typeof (SwiftDate),
+						StructMarshal.Marshaler.NominalDestroy (typeof (SwiftDate),
 						    p);
 					}
 					SwiftData = null;
diff --git a/SwiftRuntimeLibrary/SwiftDictionary.cs b/SwiftRuntimeLibrary/SwiftDictionary.cs
@@ -25,7 +25,7 @@ public SwiftDictionary (int capacity)
 					DictPI.NewDict (new IntPtr(retvalData), capacity, StructMarshal.Marshaler.Metatypeof (typeof (T)),
 					                StructMarshal.Marshaler.Metatypeof (typeof (U)),
 					                StructMarshal.Marshaler.ProtocolWitnessof (typeof (ISwiftHashable), typeof (T)));
-					StructMarshal.Marshaler.RetainNominalData (typeof (SwiftDictionary<T, U>), retvalData, SwiftData.Length);
+					StructMarshal.Marshaler.NominalInitializeWithCopy (typeof (SwiftDictionary<T, U>), retvalData, SwiftData.Length);
 				}
 			}
 		}
@@ -132,7 +132,7 @@ public bool ContainsKey (T key)
 			unsafe {
 				fixed (byte* thisPtr = SwiftData) {
 					var thisIntPtr = new IntPtr (thisPtr);
-					StructMarshal.Marshaler.RetainNominalData (typeof (SwiftDictionary<T, U>), thisIntPtr, SwiftData.Length);
+					StructMarshal.Marshaler.NominalInitializeWithCopy (typeof (SwiftDictionary<T, U>), thisIntPtr, SwiftData.Length);
 					byte* keyBuffer = stackalloc byte [StructMarshal.Marshaler.Sizeof (typeof (T))];
 					var keyBufferPtr = new IntPtr (keyBuffer);
 					StructMarshal.Marshaler.ToSwift (typeof (T), key, keyBufferPtr);
@@ -167,7 +167,7 @@ public void Clear ()
 			unsafe {
 				fixed (byte* thisPtr = SwiftData) {
 					IntPtr thisIntPtr = new IntPtr (thisPtr);
-					StructMarshal.Marshaler.RetainNominalData (typeof (SwiftDictionary<T, U>), thisIntPtr, SwiftData.Length);
+					StructMarshal.Marshaler.NominalInitializeWithCopy (typeof (SwiftDictionary<T, U>), thisIntPtr, SwiftData.Length);
 					DictPI.DictClear (thisIntPtr, StructMarshal.Marshaler.Metatypeof (typeof (T)),
 							 StructMarshal.Marshaler.Metatypeof (typeof (U)),
 							 StructMarshal.Marshaler.ProtocolWitnessof (typeof (ISwiftHashable), typeof (T)));
@@ -188,7 +188,7 @@ public bool Remove (T key)
 			unsafe {
 				fixed (byte* thisPtr = SwiftData) {
 					var thisIntPtr = new IntPtr (thisPtr);
-					StructMarshal.Marshaler.RetainNominalData (typeof (SwiftDictionary<T, U>), thisIntPtr, SwiftData.Length);
+					StructMarshal.Marshaler.NominalInitializeWithCopy (typeof (SwiftDictionary<T, U>), thisIntPtr, SwiftData.Length);
 					byte* keyBuffer = stackalloc byte [StructMarshal.Marshaler.Sizeof (typeof (T))];
 					var keyBufferPtr = new IntPtr (keyBuffer);
 					StructMarshal.Marshaler.ToSwift (typeof (T), key, keyBufferPtr);
@@ -233,7 +233,7 @@ public void Dispose ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 
 
diff --git a/SwiftRuntimeLibrary/SwiftHasher.cs b/SwiftRuntimeLibrary/SwiftHasher.cs
@@ -37,7 +37,7 @@ unsafe void Dispose (bool disposing)
 		{
 			if (SwiftData != null) {
 				fixed (byte *p = SwiftData) {
-					StructMarshal.Marshaler.ReleaseNominalData (typeof (SwiftHasher), p);
+					StructMarshal.Marshaler.NominalDestroy (typeof (SwiftHasher), p);
 				}
 				SwiftData = null;
 			}
diff --git a/SwiftRuntimeLibrary/SwiftMarshal/StructMarshal.cs b/SwiftRuntimeLibrary/SwiftMarshal/StructMarshal.cs
@@ -1461,29 +1461,29 @@ public unsafe IntPtr MarshalNominalToSwift (Type t, object o, IntPtr p)
 			return p;
 		}
 
-		public unsafe void ReleaseNominalData (Type t, byte* p)
+		public unsafe void NominalDestroy (Type t, byte* p)
 		{
-			ReleaseNominalData (t, new IntPtr (p));
+			NominalDestroy (t, new IntPtr (p));
 		}
 
-		public unsafe void ReleaseNominalData (ISwiftNominalType obj)
+		public unsafe void NominalDestroy (ISwiftNominalType obj)
 		{
 			var data = obj.SwiftData;
 			if (data != null) {
 				fixed (byte* p = data)
-					ReleaseNominalData (obj.GetType (), p);
+					NominalDestroy (obj.GetType (), p);
 				obj.SwiftData = null;
 			}
 		}
 
-		public void ReleaseNominalData (Type t, IntPtr p)
+		public void NominalDestroy (Type t, IntPtr p)
 		{
 			var mt = Metatypeof (t);
 			var destroy = GetNominalDestroy (t);
 			destroy (p, mt);
 		}
 
-		public unsafe void ReleaseNominalData (SwiftMetatype mt, byte [] p)
+		public unsafe void NominalDestroy (SwiftMetatype mt, byte [] p)
 		{
 			var destroy = GetNominalDestroy (mt);
 			fixed (byte* pptr = p) {
@@ -1514,7 +1514,7 @@ public void ReleaseSwiftPointer (Type type, IntPtr value)
 				return; // nothing to release
 
 			if (IsSwiftNominal (type) || type.IsTuple ()) {
-				ReleaseNominalData (type, value);
+				NominalDestroy (type, value);
 				return;
 			}
 
@@ -1556,7 +1556,7 @@ static DestroyDelegate GetNominalDestroy (SwiftValueWitnessTable vt)
 			return destroy;
 		}
 
-		public unsafe IntPtr RetainNominalData (ISwiftNominalType obj)
+		public unsafe IntPtr NominalInitializeWithCopy (ISwiftNominalType obj)
 		{
 			if (obj == null)
 				throw new ArgumentNullException (nameof (obj));
@@ -1565,15 +1565,15 @@ public unsafe IntPtr RetainNominalData (ISwiftNominalType obj)
 				throw new ObjectDisposedException (obj.GetType ().ToString ());
 
 			fixed (byte* ptr = obj.SwiftData)
-				return RetainNominalData (obj.GetType (), ptr, obj.SwiftData.Length);
+				return NominalInitializeWithCopy (obj.GetType (), ptr, obj.SwiftData.Length);
 		}
 
-		public unsafe IntPtr RetainNominalData (Type t, byte* p, int size)
+		public unsafe IntPtr NominalInitializeWithCopy (Type t, byte* p, int size)
 		{
-			return RetainNominalData (t, new IntPtr (p), size);
+			return NominalInitializeWithCopy (t, new IntPtr (p), size);
 		}
 
-		public IntPtr RetainNominalData (Type t, IntPtr p, int size)
+		public IntPtr NominalInitializeWithCopy (Type t, IntPtr p, int size)
 		{
 			unsafe {
 				byte* tbuf = stackalloc byte [size];
@@ -1586,7 +1586,7 @@ public IntPtr RetainNominalData (Type t, IntPtr p, int size)
 			return p;
 		}
 
-		public unsafe void RetainNominalData (SwiftMetatype metadata, byte [] p)
+		public unsafe void NominalInitializeWithCopy (SwiftMetatype metadata, byte [] p)
 		{
 			byte* tbuf = stackalloc byte [p.Length];
 			var tbufPtr = new IntPtr (tbuf);
@@ -1672,7 +1672,7 @@ public ISwiftNominalType MarshalNominalToNet (IntPtr p, Type t, bool owns)
 			Marshal.Copy (p, payload, 0, payload.Length);
 
 			if (!owns)
-				RetainNominalData (t, p, payload.Length);
+				NominalInitializeWithCopy (t, p, payload.Length);
 
 			return o;
 		}
diff --git a/SwiftRuntimeLibrary/SwiftOptional.cs b/SwiftRuntimeLibrary/SwiftOptional.cs
@@ -69,7 +69,7 @@ public void Dispose ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 
 		public static SwiftOptional<T> None ()
diff --git a/SwiftRuntimeLibrary/SwiftSet.cs b/SwiftRuntimeLibrary/SwiftSet.cs
@@ -57,7 +57,7 @@ public void Dispose ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 
 		public unsafe nint Count {
diff --git a/SwiftRuntimeLibrary/SwiftString.cs b/SwiftRuntimeLibrary/SwiftString.cs
@@ -40,7 +40,7 @@ public void Dispose ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 
 		// As of the first release of Swift 5.0, using FromUTF16Pointer leaks memory for every string
diff --git a/SwiftRuntimeLibrary/UnsafeMutablePointer.cs b/SwiftRuntimeLibrary/UnsafeMutablePointer.cs
@@ -54,7 +54,7 @@ public void Dispose ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 
 		public static UnsafeMutablePointer<T> Allocate(nint capacity)
diff --git a/SwiftRuntimeLibrary/UnsafeMutableRawBufferPointer.cs b/SwiftRuntimeLibrary/UnsafeMutableRawBufferPointer.cs
@@ -76,7 +76,7 @@ void Dispose (bool disposing)
 			if (SwiftData != null) {
 				unsafe {
 					fixed (byte* p = SwiftData) {
-						StructMarshal.Marshaler.ReleaseNominalData (typeof (UnsafeRawBufferPointer), p);
+						StructMarshal.Marshaler.NominalDestroy (typeof (UnsafeRawBufferPointer), p);
 					}
 					SwiftData = null;
 				}
diff --git a/SwiftRuntimeLibrary/UnsafePointer.cs b/SwiftRuntimeLibrary/UnsafePointer.cs
@@ -59,7 +59,7 @@ public void Dispose ()
 
 		void Dispose (bool disposing)
 		{
-			StructMarshal.Marshaler.ReleaseNominalData (this);
+			StructMarshal.Marshaler.NominalDestroy (this);
 		}
 
 
diff --git a/SwiftRuntimeLibrary/UnsafeRawBufferPointer.cs b/SwiftRuntimeLibrary/UnsafeRawBufferPointer.cs
@@ -71,7 +71,7 @@ void Dispose (bool disposing)
 			if (SwiftData != null) {
 				unsafe {
 					fixed (byte* p = SwiftData) {
-						StructMarshal.Marshaler.ReleaseNominalData (typeof (UnsafeRawBufferPointer), p);
+						StructMarshal.Marshaler.NominalDestroy (typeof (UnsafeRawBufferPointer), p);
 					}
 					SwiftData = null;
 				}

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public void Dispose ()`
`147`	`147`
`148`	`148`	`void Dispose (bool disposing)`
`149`	`149`	`{`
`150`		`- StructMarshal.Marshaler.ReleaseNominalData (this);`
	`150`	`+ StructMarshal.Marshaler.NominalDestroy (this);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public IEnumerator<T> GetEnumerator ()`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public unsafe override string ToString ()`
`72`	`72`
`73`	`73`	`void Dispose (bool disposing)`
`74`	`74`	`{`
`75`		`- StructMarshal.Marshaler.ReleaseNominalData (this);`
	`75`	`+ StructMarshal.Marshaler.NominalDestroy (this);`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ void Dispose (bool disposing)`
`99`	`99`	`if (SwiftData != null) {`
`100`	`100`	`unsafe {`
`101`	`101`	`fixed (byte* p = SwiftData) {`
`102`		`- StructMarshal.Marshaler.ReleaseNominalData (typeof (SwiftDate),`
	`102`	`+ StructMarshal.Marshaler.NominalDestroy (typeof (SwiftDate),`
`103`	`103`	`p);`
`104`	`104`	`}`
`105`	`105`	`SwiftData = null;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ unsafe void Dispose (bool disposing)`
`37`	`37`	`{`
`38`	`38`	`if (SwiftData != null) {`
`39`	`39`	`fixed (byte *p = SwiftData) {`
`40`		`- StructMarshal.Marshaler.ReleaseNominalData (typeof (SwiftHasher), p);`
	`40`	`+ StructMarshal.Marshaler.NominalDestroy (typeof (SwiftHasher), p);`
`41`	`41`	`}`
`42`	`42`	`SwiftData = null;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1461,29 +1461,29 @@ public unsafe IntPtr MarshalNominalToSwift (Type t, object o, IntPtr p)`
`1461`	`1461`	`return p;`
`1462`	`1462`	`}`
`1463`	`1463`
`1464`		`- public unsafe void ReleaseNominalData (Type t, byte* p)`
	`1464`	`+ public unsafe void NominalDestroy (Type t, byte* p)`
`1465`	`1465`	`{`
`1466`		`- ReleaseNominalData (t, new IntPtr (p));`
	`1466`	`+ NominalDestroy (t, new IntPtr (p));`
`1467`	`1467`	`}`
`1468`	`1468`
`1469`		`- public unsafe void ReleaseNominalData (ISwiftNominalType obj)`
	`1469`	`+ public unsafe void NominalDestroy (ISwiftNominalType obj)`
`1470`	`1470`	`{`
`1471`	`1471`	`var data = obj.SwiftData;`
`1472`	`1472`	`if (data != null) {`
`1473`	`1473`	`fixed (byte* p = data)`
`1474`		`- ReleaseNominalData (obj.GetType (), p);`
	`1474`	`+ NominalDestroy (obj.GetType (), p);`
`1475`	`1475`	`obj.SwiftData = null;`
`1476`	`1476`	`}`
`1477`	`1477`	`}`
`1478`	`1478`
`1479`		`- public void ReleaseNominalData (Type t, IntPtr p)`
	`1479`	`+ public void NominalDestroy (Type t, IntPtr p)`
`1480`	`1480`	`{`
`1481`	`1481`	`var mt = Metatypeof (t);`
`1482`	`1482`	`var destroy = GetNominalDestroy (t);`
`1483`	`1483`	`destroy (p, mt);`
`1484`	`1484`	`}`
`1485`	`1485`
`1486`		`- public unsafe void ReleaseNominalData (SwiftMetatype mt, byte [] p)`
	`1486`	`+ public unsafe void NominalDestroy (SwiftMetatype mt, byte [] p)`
`1487`	`1487`	`{`
`1488`	`1488`	`var destroy = GetNominalDestroy (mt);`
`1489`	`1489`	`fixed (byte* pptr = p) {`
`@@ -1514,7 +1514,7 @@ public void ReleaseSwiftPointer (Type type, IntPtr value)`
`1514`	`1514`	`return; // nothing to release`
`1515`	`1515`
`1516`	`1516`	`if (IsSwiftNominal (type) \|\| type.IsTuple ()) {`
`1517`		`- ReleaseNominalData (type, value);`
	`1517`	`+ NominalDestroy (type, value);`
`1518`	`1518`	`return;`
`1519`	`1519`	`}`
`1520`	`1520`
`@@ -1556,7 +1556,7 @@ static DestroyDelegate GetNominalDestroy (SwiftValueWitnessTable vt)`
`1556`	`1556`	`return destroy;`
`1557`	`1557`	`}`
`1558`	`1558`
`1559`		`- public unsafe IntPtr RetainNominalData (ISwiftNominalType obj)`
	`1559`	`+ public unsafe IntPtr NominalInitializeWithCopy (ISwiftNominalType obj)`
`1560`	`1560`	`{`
`1561`	`1561`	`if (obj == null)`
`1562`	`1562`	`throw new ArgumentNullException (nameof (obj));`
`@@ -1565,15 +1565,15 @@ public unsafe IntPtr RetainNominalData (ISwiftNominalType obj)`
`1565`	`1565`	`throw new ObjectDisposedException (obj.GetType ().ToString ());`
`1566`	`1566`
`1567`	`1567`	`fixed (byte* ptr = obj.SwiftData)`
`1568`		`- return RetainNominalData (obj.GetType (), ptr, obj.SwiftData.Length);`
	`1568`	`+ return NominalInitializeWithCopy (obj.GetType (), ptr, obj.SwiftData.Length);`
`1569`	`1569`	`}`
`1570`	`1570`
`1571`		`- public unsafe IntPtr RetainNominalData (Type t, byte* p, int size)`
	`1571`	`+ public unsafe IntPtr NominalInitializeWithCopy (Type t, byte* p, int size)`
`1572`	`1572`	`{`
`1573`		`- return RetainNominalData (t, new IntPtr (p), size);`
	`1573`	`+ return NominalInitializeWithCopy (t, new IntPtr (p), size);`
`1574`	`1574`	`}`
`1575`	`1575`
`1576`		`- public IntPtr RetainNominalData (Type t, IntPtr p, int size)`
	`1576`	`+ public IntPtr NominalInitializeWithCopy (Type t, IntPtr p, int size)`
`1577`	`1577`	`{`
`1578`	`1578`	`unsafe {`
`1579`	`1579`	`byte* tbuf = stackalloc byte [size];`
`@@ -1586,7 +1586,7 @@ public IntPtr RetainNominalData (Type t, IntPtr p, int size)`
`1586`	`1586`	`return p;`
`1587`	`1587`	`}`
`1588`	`1588`
`1589`		`- public unsafe void RetainNominalData (SwiftMetatype metadata, byte [] p)`
	`1589`	`+ public unsafe void NominalInitializeWithCopy (SwiftMetatype metadata, byte [] p)`
`1590`	`1590`	`{`
`1591`	`1591`	`byte* tbuf = stackalloc byte [p.Length];`
`1592`	`1592`	`var tbufPtr = new IntPtr (tbuf);`
`@@ -1672,7 +1672,7 @@ public ISwiftNominalType MarshalNominalToNet (IntPtr p, Type t, bool owns)`
`1672`	`1672`	`Marshal.Copy (p, payload, 0, payload.Length);`
`1673`	`1673`
`1674`	`1674`	`if (!owns)`
`1675`		`- RetainNominalData (t, p, payload.Length);`
	`1675`	`+ NominalInitializeWithCopy (t, p, payload.Length);`
`1676`	`1676`
`1677`	`1677`	`return o;`
`1678`	`1678`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public void Dispose ()`
`69`	`69`
`70`	`70`	`void Dispose (bool disposing)`
`71`	`71`	`{`
`72`		`- StructMarshal.Marshaler.ReleaseNominalData (this);`
	`72`	`+ StructMarshal.Marshaler.NominalDestroy (this);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public static SwiftOptional<T> None ()`