Merge pull request #831 from tannergooding/fix-inline-array-subscript-addressof

Don't take the address of a subscripted inline-array field

Author: tannergooding

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs

@@ -1530,7 +1530,9 @@ private void VisitImplicitCastExpr(ImplicitCastExpr implicitCastExpr)
                     // value type, which has no implicit pointer conversion, so take its address to
                     // bind it to a pointer. A compatible-mode fixed buffer decays on its own, and
                     // array locals (managed arrays) or string literals must not be addressed here.
-                    if (!Config.GenerateCompatibleCode && (subExpr is MemberExpr) && (subExpr.Type.CanonicalType is ConstantArrayType) && (implicitCastExpr.Type.CanonicalType is PointerType))
+                    // A subscripted field (`arr[i]`) indexes the inline array in place, so the decay
+                    // there is an lvalue that must not be addressed.
+                    if (!Config.GenerateCompatibleCode && (subExpr is MemberExpr) && (subExpr.Type.CanonicalType is ConstantArrayType) && (implicitCastExpr.Type.CanonicalType is PointerType) && !IsPrevContextStmt<ArraySubscriptExpr>(out _, out _))
                     {
                         outputBuilder.Write('&');
                     }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Compatible.Unix.cs

@@ -16,6 +16,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Compatible.Windows.cs

@@ -16,6 +16,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Default.Unix.cs

@@ -23,6 +23,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(&pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Default.Windows.cs

@@ -23,6 +23,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(&pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Latest.Unix.cs

@@ -23,6 +23,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(&pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Latest.Windows.cs

@@ -23,6 +23,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(&pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Preview.Unix.cs

@@ -23,6 +23,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(&pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.CSharp.Preview.Windows.cs

@@ -23,6 +23,7 @@ public static unsafe partial class Methods
         public static void MyFunction([NativeTypeName("struct MyStruct *")] MyStruct* pStruct)
         {
             MyOtherFunction(&pStruct->Data);
+            pStruct->Data[15] = 1;
         }
     }
 }

tests/ClangSharp.PInvokeGenerator.UnitTests/Baseline/Baselines/FunctionDeclarationBodyImport/ArrayFieldToPointerArgumentTest.Xml.Compatible.Unix.xml

@@ -18,7 +18,8 @@
         <param name="pStruct">
           <type>MyStruct*</type>
         </param>
-        <code>MyOtherFunction(pStruct-&gt;Data);</code>
+        <code>MyOtherFunction(pStruct-&gt;Data);
+      pStruct-&gt;Data[15] = 1;</code>
       </function>
     </class>
   </namespace>