Fix makeDebuggableView/makeDebuggableViewList

Author: pookjw

Sources/OpenSwiftUICore/View/ViewDebug.swift

@@ -134,20 +134,28 @@ extension ViewModifier {
         inputs: _ViewInputs,
         body: @escaping (_Graph, _ViewInputs) -> _ViewOutputs
     ) -> _ViewOutputs {
-        Subgraph.beginTreeElement(value: modifier.value, flags: 0)
-        var inputs = inputs
-        inputs.changedDebugProperties = []
+        let shouldRecordTree = Subgraph.shouldRecordTree
+        if shouldRecordTree {
+            Subgraph.beginTreeElement(value: modifier.value, flags: 0)
+        }
+        
+        var inouts = inputs
+        let prev = inouts.changedDebugProperties
+        inouts.changedDebugProperties = []
+        
         var outputs = _makeView(
             modifier: modifier,
             inputs: inputs,
             body: body
         )
-        if Subgraph.shouldRecordTree {
-            withUnsafePointer(to: inputs) { pointer in
-                _ViewDebug.reallyWrap(&outputs, value: modifier, inputs: pointer)
-            }
+        
+        inouts.changedDebugProperties = prev
+        
+        if shouldRecordTree {
+            _ViewDebug.reallyWrap(&outputs, value: modifier, inputs: &inouts)
+            Subgraph.endTreeElement(value: modifier.value)
         }
-        Subgraph.endTreeElement(value: modifier.value)
+        
         return outputs
     }
 
@@ -157,9 +165,18 @@ extension ViewModifier {
         inputs: _ViewListInputs,
         body: @escaping (_Graph, _ViewListInputs) -> _ViewListOutputs
     ) -> _ViewListOutputs {
-        Subgraph.beginTreeElement(value: modifier.value, flags: 1)
-        defer { Subgraph.endTreeElement(value: modifier.value) }
-        return _makeViewList(modifier: modifier, inputs: inputs, body: body)
+        let shouldRecordTree = Subgraph.shouldRecordTree
+        if shouldRecordTree {
+            Subgraph.beginTreeElement(value: modifier.value, flags: 1)
+        }
+        
+        let outputs = _makeViewList(modifier: modifier, inputs: inputs, body: body)
+        
+        if shouldRecordTree {
+            Subgraph.endTreeElement(value: modifier.value)
+        }
+        
+        return outputs
     }
 }
 
@@ -169,19 +186,23 @@ extension View {
         view: _GraphValue<Self>,
         inputs: _ViewInputs
     ) -> _ViewOutputs {
-        Subgraph.beginTreeElement(value: view.value, flags: 0)
-        var inputs = inputs
-        inputs.changedDebugProperties = []
-        var outputs = _makeView(
-            view: view,
-            inputs: inputs
-        )
-        if Subgraph.shouldRecordTree {
-            withUnsafePointer(to: inputs) { pointer in
-                _ViewDebug.reallyWrap(&outputs, value: view, inputs: pointer)
-            }
+        let shouldRecordTree = Subgraph.shouldRecordTree
+        if shouldRecordTree {
+            Subgraph.beginTreeElement(value: view.value, flags: 0)
         }
-        Subgraph.endTreeElement(value: view.value)
+        
+        var inouts = inputs
+        let prev = inouts.changedDebugProperties
+        inouts.changedDebugProperties = []
+        
+        var outputs = Self._makeView(view: view, inputs: inouts)
+        inouts.changedDebugProperties = prev
+        
+        if shouldRecordTree {
+            _ViewDebug.reallyWrap(&outputs, value: view, inputs: &inouts)
+            Subgraph.endTreeElement(value: view.value)
+        }
+        
         return outputs
     }
 
@@ -190,9 +211,18 @@ extension View {
         view: _GraphValue<Self>,
         inputs: _ViewListInputs
     ) -> _ViewListOutputs {
-        Subgraph.beginTreeElement(value: view.value, flags: 1)
-        defer { Subgraph.endTreeElement(value: view.value) }
-        return _makeViewList(view: view, inputs: inputs)
+        let shouldRecordTree = Subgraph.shouldRecordTree
+        if shouldRecordTree {
+            Subgraph.beginTreeElement(value: view.value, flags: 1)
+        }
+        
+        let outputs = _makeViewList(view: view, inputs: inputs)
+        
+        if shouldRecordTree {
+            Subgraph.endTreeElement(value: view.value)
+        }
+        
+        return outputs
     }
 }