Merge branch 'main' into bugfix/natvis-template-constant

Author: gregg-miskelly

src/MIDebugEngine/Natvis.Impl/Natvis.cs

@@ -646,8 +646,9 @@ private IVariableInformation[] ExpandVisualized(IVariableInformation variable)
                             {
                                 continue;
                             }
-                            // Creates an expression: (T[50])*(<ValuePointer> + 50)
-                            // This evaluates for 50 elements of type T, starting at <ValuePointer> with an offet of 50 elements.
+
+                            // Creates a dereferenced pointer-to-array expression: (*(T(*)[50])(ValuePointer + 50))
+                            // This evaluates for 50 elements of type T, starting at <ValuePointer> with an offset of 50 elements.
                             // E.g. This will grab elements 50 - 99 from <ValuePointer>.
                             // Note:
                             //   If requestedSize > 1000, the evaluation will only grab the first 1000 elements.
@@ -656,15 +657,15 @@ private IVariableInformation[] ExpandVisualized(IVariableInformation variable)
                             uint requestedSize = Math.Min(MAX_EXPAND, totalSize - startIndex);
 
                             StringBuilder arrayBuilder = new StringBuilder();
-                            arrayBuilder.Append('(');
+                            arrayBuilder.Append("(*(");
                             arrayBuilder.Append(typename);
-                            arrayBuilder.Append('[');
+                            arrayBuilder.Append("(*)[");
                             arrayBuilder.Append(requestedSize);
-                            arrayBuilder.Append("])*(");
+                            arrayBuilder.Append("])(");
                             arrayBuilder.Append(vp.Value);
                             arrayBuilder.Append('+');
                             arrayBuilder.Append(startIndex);
-                            arrayBuilder.Append(')');
+                            arrayBuilder.Append("))");
                             string arrayStr = arrayBuilder.ToString();
 
                             IVariableInformation arrayExpr = GetExpression(arrayStr, variable, visualizer.ScopedNames);

test/CppTests/Tests/NatvisTests.cs

@@ -138,11 +138,6 @@ public void TestIndexListItems(ITestSettings settings)
         [Theory]
         [DependsOnTest(nameof(CompileNatvisDebuggee))]
         [RequiresTestSettings]
-        // Disable on macOS
-        // Error:
-        //   C-style cast from 'int' to 'int [10]' is not allowed
-        //   (int[10])*(((vec)._start))
-        [UnsupportedDebugger(SupportedDebugger.Lldb, SupportedArchitecture.x64 | SupportedArchitecture.x86)]
         public void TestArrayItems(ITestSettings settings)
         {
             this.TestPurpose("This test checks if ArrayItems are visualized.");
@@ -193,11 +188,6 @@ public void TestArrayItems(ITestSettings settings)
         [Theory]
         [DependsOnTest(nameof(CompileNatvisDebuggee))]
         [RequiresTestSettings]
-        // Disable on macOS
-        // Error:
-        //   C-style cast from 'int' to 'int [10]' is not allowed
-        //   (int[10])*(((vec)._start))
-        [UnsupportedDebugger(SupportedDebugger.Lldb, SupportedArchitecture.x64 | SupportedArchitecture.x86)]
         public void Test2000ArrayItems(ITestSettings settings)
         {
             this.TestPurpose("This test checks if ArrayItems can be visualized past 1000 elements.");
@@ -484,11 +474,6 @@ public void TestCommaFormatWithSquareBrackets(ITestSettings settings)
         [Theory]
         [DependsOnTest(nameof(CompileNatvisDebuggee))]
         [RequiresTestSettings]
-        // Disable on macOS
-        // Error:
-        //   C-style cast from 'int' to 'int [10]' is not allowed
-        //   (int[10])*(((vec)._start))
-        [UnsupportedDebugger(SupportedDebugger.Lldb, SupportedArchitecture.x64 | SupportedArchitecture.x86)]
         public void TestMultipleNatvisFiles(ITestSettings settings)
         {
             this.TestPurpose("This test checks if multiple Natvis files can be used.");