Merge pull request dotnet#1963 from tmat/RemoveEmptySP

Avoid generating an empty sequencePoint element in PdbToXml tool
shyamnamboodiripad · Apr 14, 2015 · 4d691ac · 4d691ac
2 parents b61047b + 25de638
commit 4d691ac
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 33 deletions.
diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncEHTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncEHTests.cs
@@ -545,7 +545,6 @@ public static void Main()
           <slot kind=""28"" offset=""156"" ordinal=""1"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>

diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncLocalsTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncLocalsTests.cs
@@ -287,7 +287,6 @@ public async Task M(IDisposable disposable)
           <slot kind=""2"" offset=""410"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>

diff --git a/src/Compilers/CSharp/Test/Emit/PDB/PDBAsyncTests.cs b/src/Compilers/CSharp/Test/Emit/PDB/PDBAsyncTests.cs
@@ -213,7 +213,6 @@ .locals init (int V_0,
           <lambda offset=""86"" />
         </encLambdaMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""TestCase"" name="".cctor"">
       <customDebugInfo>
@@ -398,7 +397,6 @@ private Task<int> GetNextInt(Random random)
       <customDebugInfo>
         <forwardIterator name=""&lt;QBar&gt;d__2"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""ConsoleApplication1.Program"" name=""ZBar"">
       <customDebugInfo>
@@ -412,7 +410,6 @@ private Task<int> GetNextInt(Random random)
           <slot kind=""28"" offset=""141"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""ConsoleApplication1.Program"" name=""GetNextInt"" parameterNames=""random"">
       <customDebugInfo>
@@ -663,7 +660,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <lambda offset=""95"" closure=""0"" />
         </encLambdaMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -763,7 +759,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <lambda offset=""95"" closure=""0"" />
         </encLambdaMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -852,7 +847,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <lambda offset=""95"" closure=""0"" />
         </encLambdaMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -952,7 +946,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <lambda offset=""95"" closure=""0"" />
         </encLambdaMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -1037,7 +1030,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <slot kind=""0"" offset=""19"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>
@@ -1116,7 +1108,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
       <customDebugInfo>
         <forwardIterator name=""&lt;M&gt;d__0"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>
@@ -1202,7 +1193,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <slot kind=""0"" offset=""19"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>
@@ -1307,7 +1297,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <slot kind=""28"" offset=""105"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -1573,7 +1562,6 @@ static async Task<int> G()
           <slot kind=""29"" offset=""150"" ordinal=""3"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");

diff --git a/src/Compilers/CSharp/Test/Emit/PDB/PDBIteratorTests.cs b/src/Compilers/CSharp/Test/Emit/PDB/PDBIteratorTests.cs
@@ -34,7 +34,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
       <customDebugInfo>
         <forwardIterator name=""&lt;Foo&gt;d__0"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Program"" name=""F"">
       <customDebugInfo>
@@ -89,7 +88,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
       <customDebugInfo>
         <forwardIterator name=""&lt;Foo&gt;d__0"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Program"" name=""F"">
       <customDebugInfo>
@@ -144,7 +142,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
       <customDebugInfo>
         <forwardIterator name=""&lt;Foo&gt;d__0"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Program"" name=""F"">
       <customDebugInfo>
@@ -207,7 +204,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
       <customDebugInfo>
         <forwardIterator name=""&lt;IEI&gt;d__0"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Program"" name=""F"">
       <customDebugInfo>
@@ -280,7 +276,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <slot kind=""0"" offset=""101"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Program"" name=""F"">
       <customDebugInfo>
@@ -364,7 +359,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <slot kind=""0"" offset=""42"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Test`1"" name=""F"">
       <customDebugInfo>
@@ -461,7 +455,6 @@ static void Main()
       <customDebugInfo>
         <forwardIterator name=""&lt;M&gt;d__0"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""C"" name=""Main"">
       <customDebugInfo>
@@ -596,19 +589,16 @@ public static void Main()
           <slot kind=""0"" offset=""104"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Test`1"" name=""get_IterProp"">
       <customDebugInfo>
         <forwardIterator name=""&lt;get_IterProp&gt;d__3"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Test`1"" name=""IterMethod"">
       <customDebugInfo>
         <forwardIterator name=""&lt;IterMethod&gt;d__4"" />
       </customDebugInfo>
-      <sequencePoints />
     </method>
     <method containingType=""Test"" name=""Main"">
       <customDebugInfo>
@@ -991,7 +981,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <slot kind=""2"" offset=""367"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -1186,7 +1175,6 @@ .locals init (int V_0)
           <lambda offset=""95"" closure=""0"" />
         </encLambdaMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -1342,7 +1330,6 @@ .locals init (int V_0,
           <lambda offset=""95"" closure=""0"" />
         </encLambdaMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>");
@@ -1418,7 +1405,6 @@ public void F() { } // needs to be present to work around SymWriter bug #1068894
           <slot kind=""0"" offset=""19"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencePoints />
     </method>
   </methods>
 </symbols>

diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBAsyncTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBAsyncTests.vb
@@ -53,7 +53,6 @@ End Module
             <customDebugInfo>
                 <forwardIterator name="VB$StateMachine_1_F"/>
             </customDebugInfo>
-            <sequencePoints/>
         </method>
     </methods>
 </symbols>)
@@ -104,7 +103,6 @@ End Module
             <customDebugInfo>
                 <forwardIterator name="VB$StateMachine_2_Test"/>
             </customDebugInfo>
-            <sequencePoints/>
         </method>
     </methods>
 </symbols>)
@@ -185,7 +183,6 @@ End Module
             <customDebugInfo>
                 <forwardIterator name="VB$StateMachine_3_S"/>
             </customDebugInfo>
-            <sequencePoints/>
         </method>
     </methods>
 </symbols>)

diff --git a/src/Test/PdbUtilities/Pdb/PdbToXml.cs b/src/Test/PdbUtilities/Pdb/PdbToXml.cs
@@ -1042,9 +1042,13 @@ private static Type GetConstantRuntimeType(ImmutableArray<byte> signature)
         // A single method could span multiple files (use C#'s #line directive to see for yourself).        
         private void WriteSequencePoints(ISymUnmanagedMethod method)
         {
-            _writer.WriteStartElement("sequencePoints");
-
             var sequencePoints = method.GetSequencePoints();
+            if (sequencePoints.Length == 0)
+            {
+                return;
+            }
+
+            _writer.WriteStartElement("sequencePoints");
 
             // Write out sequence points
             foreach (var sequencePoint in sequencePoints)