Clean up local scopes produced by PdbToXml and update tests accordingly

94818712 · Tomas Matousek · 9674b478 · 94818712 · 94818712 · 94818712
33 changed file
--- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncEHTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncEHTests.cs
@@ -546,7 +546,6 @@ public static void Main()
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>

--- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncLocalsTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncLocalsTests.cs
@@ -288,7 +288,6 @@ public async Task M(IDisposable disposable)
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>

--- a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueStateMachineTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueStateMachineTests.cs
@@ -249,7 +249,6 @@ static void M()
        <entry offset=""0x34"" hidden=""true"" document=""1"" />
        <entry offset=""0x3b"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""1"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x3f"">
        <namespace name=""System.Collections.Generic"" />
      </scope>
@@ -1100,7 +1099,6 @@ .maxstack  3
        <entry offset=""0x92"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""6"" document=""0"" />
        <entry offset=""0x9a"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0xa8"">
        <namespace name=""System.Threading.Tasks"" />
      </scope>

--- a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 using System;
 using System.Collections.Immutable;
@@ -1642,9 +1642,6 @@ .maxstack  4
        <entry offset=""0x1"" startLine=""6"" startColumn=""9"" endLine=""6"" endColumn=""40"" document=""1"" />
        <entry offset=""0x18"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""1"" />
      </sequencePoints>
-      <locals>
-        <local name=""a"" il_index=""0"" il_start=""0x0"" il_end=""0x19"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x19"">
        <local name=""a"" il_index=""0"" il_start=""0x0"" il_end=""0x19"" attributes=""0"" />
      </scope>
@@ -3184,11 +3181,6 @@ .maxstack  1
        <entry offset=""0x1c"" startLine=""14"" startColumn=""9"" endLine=""14"" endColumn=""14"" document=""0"" />
        <entry offset=""0x23"" startLine=""15"" startColumn=""5"" endLine=""15"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""z"" il_index=""3"" il_start=""0x0"" il_end=""0x24"" attributes=""0"" />
-        <local name=""y"" il_index=""1"" il_start=""0x0"" il_end=""0x24"" attributes=""0"" />
-        <local name=""w"" il_index=""4"" il_start=""0x0"" il_end=""0x24"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x24"">
        <local name=""z"" il_index=""3"" il_start=""0x0"" il_end=""0x24"" attributes=""0"" />
        <local name=""y"" il_index=""1"" il_start=""0x0"" il_end=""0x24"" attributes=""0"" />
@@ -3242,10 +3234,6 @@ .maxstack  1
        <entry offset=""0x16"" startLine=""13"" startColumn=""9"" endLine=""13"" endColumn=""14"" document=""0"" />
        <entry offset=""0x1d"" startLine=""14"" startColumn=""5"" endLine=""14"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""x"" il_index=""5"" il_start=""0x0"" il_end=""0x1e"" attributes=""0"" />
-        <local name=""z"" il_index=""3"" il_start=""0x0"" il_end=""0x1e"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x1e"">
        <local name=""x"" il_index=""5"" il_start=""0x0"" il_end=""0x1e"" attributes=""0"" />
        <local name=""z"" il_index=""3"" il_start=""0x0"" il_end=""0x1e"" attributes=""0"" />
@@ -3300,10 +3288,6 @@ .maxstack  1
        <entry offset=""0x14"" startLine=""20"" startColumn=""9"" endLine=""20"" endColumn=""14"" document=""0"" />
        <entry offset=""0x1b"" startLine=""21"" startColumn=""5"" endLine=""21"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""c"" il_index=""2"" il_start=""0x0"" il_end=""0x1c"" attributes=""0"" />
-        <local name=""b"" il_index=""1"" il_start=""0x0"" il_end=""0x1c"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x1c"">
        <local name=""c"" il_index=""2"" il_start=""0x0"" il_end=""0x1c"" attributes=""0"" />
        <local name=""b"" il_index=""1"" il_start=""0x0"" il_end=""0x1c"" attributes=""0"" />
@@ -3388,10 +3372,6 @@ .maxstack  1
        <entry offset=""0x3"" startLine=""6"" startColumn=""9"" endLine=""6"" endColumn=""30"" document=""0"" />
        <entry offset=""0x9"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""a"" il_index=""2"" il_start=""0x0"" il_end=""0xa"" attributes=""0"" />
-        <local name=""b"" il_index=""1"" il_start=""0x0"" il_end=""0xa"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0xa"">
        <local name=""a"" il_index=""2"" il_start=""0x0"" il_end=""0xa"" attributes=""0"" />
        <local name=""b"" il_index=""1"" il_start=""0x0"" il_end=""0xa"" attributes=""0"" />

--- a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.cs
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 using System;
 using System.Collections.Immutable;
@@ -227,11 +227,6 @@ .maxstack  2
        <entry offset=""0x50"" hidden=""true"" document=""0"" />
        <entry offset=""0x54"" startLine=""13"" startColumn=""5"" endLine=""13"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""j"" il_index=""0"" il_start=""0x0"" il_end=""0x55"" attributes=""0"" />
-        <local name=""i"" il_index=""1"" il_start=""0x1"" il_end=""0x1a"" attributes=""0"" />
-        <local name=""i"" il_index=""4"" il_start=""0x1a"" il_end=""0x39"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x55"">
        <namespace name=""System"" />
        <local name=""j"" il_index=""0"" il_start=""0x0"" il_end=""0x55"" attributes=""0"" />
@@ -378,7 +373,6 @@ static void M()
        <entry offset=""0x2b"" hidden=""true"" document=""0"" />
        <entry offset=""0x36"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>
@@ -399,7 +393,6 @@ static void M()
        <entry offset=""0x24"" hidden=""true"" document=""0"" />
        <entry offset=""0x2e"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>
@@ -2243,7 +2236,6 @@ .locals init (int V_0)
        <entry offset=""0x23"" startLine=""10"" startColumn=""50"" endLine=""10"" endColumn=""56"" document=""0"" />
        <entry offset=""0x25"" startLine=""12"" startColumn=""5"" endLine=""12"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -2357,7 +2349,6 @@ .locals init (bool V_0)
        <entry offset=""0x12"" startLine=""11"" startColumn=""9"" endLine=""11"" endColumn=""10"" document=""0"" />
        <entry offset=""0x13"" startLine=""12"" startColumn=""5"" endLine=""12"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -2464,7 +2455,6 @@ .locals init (bool V_0)
        <entry offset=""0x12"" hidden=""true"" document=""0"" />
        <entry offset=""0x15"" startLine=""12"" startColumn=""5"" endLine=""12"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -2571,7 +2561,6 @@ .locals init (bool V_0)
        <entry offset=""0x10"" hidden=""true"" document=""0"" />
        <entry offset=""0x13"" startLine=""13"" startColumn=""5"" endLine=""13"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");

--- a/src/Compilers/CSharp/Test/Emit/PDB/CheckSumTest.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/CheckSumTest.cs
@@ -50,7 +50,6 @@ public void ChecksumAlgorithms()
        <entry offset=""0x0"" startLine=""1"" startColumn=""19"" endLine=""1"" endColumn=""30"" document=""1"" />
        <entry offset=""0x6"" startLine=""1"" startColumn=""33"" endLine=""1"" endColumn=""34"" document=""1"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""C256"" name="".ctor"">
      <customDebugInfo>
@@ -60,7 +59,6 @@ public void ChecksumAlgorithms()
        <entry offset=""0x0"" startLine=""1"" startColumn=""21"" endLine=""1"" endColumn=""34"" document=""2"" />
        <entry offset=""0x6"" startLine=""1"" startColumn=""37"" endLine=""1"" endColumn=""38"" document=""2"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>";
@@ -256,7 +254,6 @@ static void Main()
        <entry offset=""0x6"" startLine=""112"" startColumn=""9"" endLine=""112"" endColumn=""24"" document=""2"" />
        <entry offset=""0xc"" startLine=""19"" startColumn=""5"" endLine=""19"" endColumn=""6"" document=""3"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>";
@@ -297,7 +294,6 @@ void M()
        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""1"" />
        <entry offset=""0x1"" startLine=""6"" startColumn=""5"" endLine=""6"" endColumn=""6"" document=""1"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>";
@@ -338,7 +334,6 @@ class C { void M() { } }
        <entry offset=""0x0"" startLine=""10"" startColumn=""20"" endLine=""10"" endColumn=""21"" document=""1"" />
        <entry offset=""0x1"" startLine=""10"" startColumn=""22"" endLine=""10"" endColumn=""23"" document=""1"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>";
@@ -399,7 +394,6 @@ void M()
        <entry offset=""0x24"" startLine=""5"" startColumn=""9"" endLine=""5"" endColumn=""13"" document=""3"" />
        <entry offset=""0x2b"" startLine=""6"" startColumn=""5"" endLine=""6"" endColumn=""6"" document=""3"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>";
@@ -468,7 +462,6 @@ void M()
        <entry offset=""0x24"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""6"" />
        <entry offset=""0x2b"" startLine=""2"" startColumn=""5"" endLine=""2"" endColumn=""6"" document=""6"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>";
@@ -525,7 +518,6 @@ void M()
        <entry offset=""0x16"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""4"" />
        <entry offset=""0x1d"" startLine=""2"" startColumn=""5"" endLine=""2"" endColumn=""6"" document=""4"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>";

--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBAsyncTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBAsyncTests.cs
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 using System.Linq;
 using Microsoft.CodeAnalysis.CSharp.Symbols;
@@ -195,13 +195,11 @@ .maxstack  3
      <sequencePoints>
        <entry offset=""0x0"" startLine=""8"" startColumn=""35"" endLine=""8"" endColumn=""39"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""DynamicMembers"" name=""set_Prop"" parameterNames=""value"">
      <sequencePoints>
        <entry offset=""0x0"" startLine=""8"" startColumn=""40"" endLine=""8"" endColumn=""44"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""TestCase"" name="".cctor"">
      <customDebugInfo>
@@ -212,7 +210,6 @@ .maxstack  3
      <sequencePoints>
        <entry offset=""0x0"" startLine=""12"" startColumn=""5"" endLine=""12"" endColumn=""33"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x7"">
        <namespace name=""System"" />
        <namespace name=""System.Threading"" />
@@ -233,7 +230,6 @@ .maxstack  3
        </encLambdaMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Driver"" name="".cctor"">
      <customDebugInfo>
@@ -243,7 +239,6 @@ .maxstack  3
        <entry offset=""0x0"" startLine=""27"" startColumn=""5"" endLine=""27"" endColumn=""35"" document=""0"" />
        <entry offset=""0x6"" startLine=""28"" startColumn=""5"" endLine=""28"" endColumn=""78"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Driver"" name=""Main"">
      <customDebugInfo>
@@ -261,9 +256,6 @@ .maxstack  3
        <entry offset=""0x19"" startLine=""35"" startColumn=""9"" endLine=""35"" endColumn=""30"" document=""0"" />
        <entry offset=""0x21"" startLine=""36"" startColumn=""5"" endLine=""36"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""t"" il_index=""0"" il_start=""0x0"" il_end=""0x23"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x23"">
        <local name=""t"" il_index=""0"" il_start=""0x0"" il_end=""0x23"" attributes=""0"" />
      </scope>
@@ -300,7 +292,6 @@ .maxstack  3
        <entry offset=""0x11a"" startLine=""23"" startColumn=""5"" endLine=""23"" endColumn=""6"" document=""0"" />
        <entry offset=""0x122"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <catchHandler offset=""0x100"" />
        <kickoffMethod declaringType=""TestCase"" methodName=""Run"" />
@@ -327,7 +318,6 @@ .maxstack  3
        <entry offset=""0x96"" startLine=""16"" startColumn=""69"" endLine=""16"" endColumn=""70"" document=""0"" />
        <entry offset=""0x9e"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""TestCase+&lt;&gt;c"" methodName=""&lt;Run&gt;b__1_0"" />
        <await yield=""0x31"" resume=""0x4c"" declaringType=""TestCase+&lt;&gt;c+&lt;&lt;Run&gt;b__1_0&gt;d"" methodName=""MoveNext"" />
@@ -391,7 +381,6 @@ private Task<int> GetNextInt(Random random)
        <entry offset=""0x1"" startLine=""13"" startColumn=""13"" endLine=""13"" endColumn=""34"" document=""0"" />
        <entry offset=""0xc"" startLine=""14"" startColumn=""9"" endLine=""14"" endColumn=""10"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0xd"">
        <namespace name=""System"" />
        <namespace name=""System.Collections.Generic"" />
@@ -403,7 +392,6 @@ private Task<int> GetNextInt(Random random)
        <forwardIterator name=""&lt;QBar&gt;d__2"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""ConsoleApplication1.Program"" name=""ZBar"">
      <customDebugInfo>
@@ -418,7 +406,6 @@ private Task<int> GetNextInt(Random random)
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""ConsoleApplication1.Program"" name=""GetNextInt"" parameterNames=""random"">
      <customDebugInfo>
@@ -429,7 +416,6 @@ private Task<int> GetNextInt(Random random)
        <entry offset=""0x1"" startLine=""31"" startColumn=""13"" endLine=""31"" endColumn=""51"" document=""0"" />
        <entry offset=""0xf"" startLine=""32"" startColumn=""9"" endLine=""32"" endColumn=""10"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""ConsoleApplication1.Program"" name="".cctor"">
      <customDebugInfo>
@@ -438,7 +424,6 @@ private Task<int> GetNextInt(Random random)
      <sequencePoints>
        <entry offset=""0x0"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""53"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""ConsoleApplication1.Program+&lt;QBar&gt;d__2"" name=""MoveNext"">
      <customDebugInfo>
@@ -460,7 +445,6 @@ private Task<int> GetNextInt(Random random)
        <entry offset=""0x93"" startLine=""18"" startColumn=""9"" endLine=""18"" endColumn=""10"" document=""0"" />
        <entry offset=""0x9b"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <catchHandler offset=""0x7b"" />
        <kickoffMethod declaringType=""ConsoleApplication1.Program"" methodName=""QBar"" />
@@ -507,7 +491,6 @@ private Task<int> GetNextInt(Random random)
        <entry offset=""0x139"" startLine=""28"" startColumn=""9"" endLine=""28"" endColumn=""10"" document=""0"" />
        <entry offset=""0x141"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""ConsoleApplication1.Program"" methodName=""ZBar"" />
        <await yield=""0x7d"" resume=""0x9c"" declaringType=""ConsoleApplication1.Program+&lt;ZBar&gt;d__3"" methodName=""MoveNext"" />
@@ -565,7 +548,6 @@ static async void Await(dynamic d)
        <entry offset=""0x24d"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
        <entry offset=""0x255"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <catchHandler offset=""0x233"" />
        <kickoffMethod declaringType=""TestCase"" methodName=""Await"" parameterNames=""d"" />
@@ -635,9 +617,6 @@ static async Task M(int b)
        <entry offset=""0xc2"" startLine=""16"" startColumn=""5"" endLine=""16"" endColumn=""6"" document=""0"" />
        <entry offset=""0xca"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""CS$&lt;&gt;8__locals0"" il_index=""1"" il_start=""0xa"" il_end=""0xab"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0xd6"">
        <scope startOffset=""0xa"" endOffset=""0xab"">
          <local name=""CS$&lt;&gt;8__locals0"" il_index=""1"" il_start=""0xa"" il_end=""0xab"" attributes=""0"" />
@@ -664,7 +643,6 @@ static async Task M(int b)
        </encLambdaMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -741,7 +719,6 @@ static async Task M(int b)
        <entry offset=""0xf9"" startLine=""19"" startColumn=""5"" endLine=""19"" endColumn=""6"" document=""0"" />
        <entry offset=""0x101"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""C"" methodName=""M"" parameterNames=""b"" />
        <await yield=""0x98"" resume=""0xb3"" declaringType=""C+&lt;M&gt;d__0"" methodName=""MoveNext"" />
@@ -766,7 +743,6 @@ static async Task M(int b)
        </encLambdaMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -835,7 +811,6 @@ static async Task M(int b)
        <entry offset=""0xd8"" startLine=""18"" startColumn=""5"" endLine=""18"" endColumn=""6"" document=""0"" />
        <entry offset=""0xe0"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""C"" methodName=""M"" parameterNames=""b"" />
        <await yield=""0x6d"" resume=""0x84"" declaringType=""C+&lt;M&gt;d__0"" methodName=""MoveNext"" />
@@ -857,7 +832,6 @@ static async Task M(int b)
        </encLambdaMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -934,7 +908,6 @@ static async Task M(int b)
        <entry offset=""0xe8"" startLine=""18"" startColumn=""5"" endLine=""18"" endColumn=""6"" document=""0"" />
        <entry offset=""0xf0"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""C"" methodName=""M"" parameterNames=""b"" />
        <await yield=""0x76"" resume=""0x91"" declaringType=""C+&lt;M&gt;d__0"" methodName=""MoveNext"" />
@@ -959,7 +932,6 @@ static async Task M(int b)
        </encLambdaMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1026,7 +998,6 @@ static async Task M()
        <entry offset=""0xf5"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""0"" />
        <entry offset=""0xfd"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""C"" methodName=""M"" />
        <await yield=""0x39"" resume=""0x57"" declaringType=""C+&lt;M&gt;d__0"" methodName=""MoveNext"" />
@@ -1046,7 +1017,6 @@ static async Task M()
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>
@@ -1105,9 +1075,6 @@ static async Task M()
        <entry offset=""0xdd"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""0"" />
        <entry offset=""0xe5"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""d"" il_index=""1"" il_start=""0xd"" il_end=""0xc6"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0xf1"">
        <scope startOffset=""0xd"" endOffset=""0xc6"">
          <local name=""d"" il_index=""1"" il_start=""0xd"" il_end=""0xc6"" attributes=""0"" />
@@ -1129,7 +1096,6 @@ static async Task M()
        <forwardIterator name=""&lt;M&gt;d__0"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>
@@ -1197,7 +1163,6 @@ static async Task M()
        <entry offset=""0xf5"" startLine=""14"" startColumn=""5"" endLine=""14"" endColumn=""6"" document=""0"" />
        <entry offset=""0xfd"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""C"" methodName=""M"" />
        <await yield=""0x94"" resume=""0xaf"" declaringType=""C+&lt;M&gt;d__0"" methodName=""MoveNext"" />
@@ -1217,7 +1182,6 @@ static async Task M()
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>
@@ -1323,7 +1287,6 @@ static async Task<int> G()
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1511,7 +1474,6 @@ .maxstack  3
        <entry offset=""0x108"" startLine=""20"" startColumn=""5"" endLine=""20"" endColumn=""6"" document=""0"" />
        <entry offset=""0x110"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
      <asyncInfo>
        <kickoffMethod declaringType=""C"" methodName=""G"" />
        <await yield=""0x51"" resume=""0x70"" declaringType=""C+&lt;G&gt;d__0"" methodName=""MoveNext"" />
@@ -1591,7 +1553,6 @@ static async Task<int> G()
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");

--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBConstantTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBConstantTests.cs
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 using System.Globalization;
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
@@ -42,10 +42,6 @@ void M()
        <entry offset=""0x2"" startLine=""9"" startColumn=""9"" endLine=""9"" endColumn=""10"" document=""0"" />
        <entry offset=""0x3"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <constant name=""x"" value=""1"" type=""Int32"" />
-        <constant name=""y"" value=""2"" type=""Int32"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x4"">
        <constant name=""x"" value=""1"" type=""Int32"" />
        <scope startOffset=""0x1"" endOffset=""0x3"">
@@ -97,9 +93,6 @@ void M(Action a)
        <entry offset=""0x1"" startLine=""9"" startColumn=""9"" endLine=""15"" endColumn=""12"" document=""0"" />
        <entry offset=""0x27"" startLine=""16"" startColumn=""5"" endLine=""16"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <constant name=""x"" value=""1"" type=""Int32"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x28"">
        <namespace name=""System"" />
        <constant name=""x"" value=""1"" type=""Int32"" />
@@ -115,10 +108,6 @@ void M(Action a)
        <entry offset=""0x2"" startLine=""14"" startColumn=""13"" endLine=""14"" endColumn=""14"" document=""0"" />
        <entry offset=""0x5"" startLine=""15"" startColumn=""9"" endLine=""15"" endColumn=""10"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <constant name=""y"" value=""2"" type=""Int32"" />
-        <constant name=""z"" value=""3"" type=""Int32"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x6"">
        <constant name=""y"" value=""2"" type=""Int32"" />
        <scope startOffset=""0x1"" endOffset=""0x3"">
@@ -198,10 +187,6 @@ IEnumerable<int> M()
        <entry offset=""0x68"" hidden=""true"" document=""0"" />
        <entry offset=""0x6b"" startLine=""14"" startColumn=""5"" endLine=""14"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <constant name=""x"" value=""1"" type=""Int32"" />
-        <constant name=""y"" value=""2"" type=""Int32"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x6f"">
        <namespace name=""System.Collections.Generic"" />
        <scope startOffset=""0x21"" endOffset=""0x6f"">
@@ -246,12 +231,6 @@ void M()
        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
        <entry offset=""0x1"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <constant name=""o"" value=""null"" type=""Object"" />
-        <constant name=""s"" value=""hello"" type=""String"" />
-        <constant name=""f"" value=""-3.402823E+38"" type=""Single"" />
-        <constant name=""d"" value=""1.79769313486232E+308"" type=""Double"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x2"">
        <constant name=""o"" value=""null"" type=""Object"" />
        <constant name=""s"" value=""hello"" type=""String"" />
@@ -325,7 +304,6 @@ void M()
        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
        <entry offset=""0x1"" startLine=""43"" startColumn=""5"" endLine=""43"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -358,9 +336,6 @@ void M()
        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
        <entry offset=""0x1"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <constant name=""d"" value=""1.5"" type=""Decimal"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x2"">
        <constant name=""d"" value=""1.5"" type=""Decimal"" />
      </scope>

--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBDynamicLocalsTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBDynamicLocalsTests.cs
--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBIteratorTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBIteratorTests.cs
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 using System.Linq;
 using Microsoft.CodeAnalysis.CSharp.Symbols;
@@ -35,7 +35,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <forwardIterator name=""&lt;Foo&gt;d__0"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Program"" name=""F"">
      <customDebugInfo>
@@ -47,7 +46,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <entry offset=""0x0"" startLine=""9"" startColumn=""21"" endLine=""9"" endColumn=""22"" document=""0"" />
        <entry offset=""0x1"" startLine=""9"" startColumn=""23"" endLine=""9"" endColumn=""24"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Program+&lt;Foo&gt;d__0"" name=""MoveNext"">
      <customDebugInfo>
@@ -62,7 +60,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <entry offset=""0x19"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
        <entry offset=""0x1a"" startLine=""6"" startColumn=""9"" endLine=""6"" endColumn=""21"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -93,7 +90,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <forwardIterator name=""&lt;Foo&gt;d__0"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Program"" name=""F"">
      <customDebugInfo>
@@ -105,7 +101,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <entry offset=""0x0"" startLine=""9"" startColumn=""21"" endLine=""9"" endColumn=""22"" document=""0"" />
        <entry offset=""0x1"" startLine=""9"" startColumn=""23"" endLine=""9"" endColumn=""24"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Program+&lt;Foo&gt;d__0"" name=""MoveNext"">
      <customDebugInfo>
@@ -120,7 +115,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <entry offset=""0x19"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
        <entry offset=""0x1a"" startLine=""6"" startColumn=""9"" endLine=""6"" endColumn=""21"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -151,7 +145,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <forwardIterator name=""&lt;Foo&gt;d__0"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Program"" name=""F"">
      <customDebugInfo>
@@ -163,7 +156,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <entry offset=""0x0"" startLine=""9"" startColumn=""21"" endLine=""9"" endColumn=""22"" document=""0"" />
        <entry offset=""0x1"" startLine=""9"" startColumn=""23"" endLine=""9"" endColumn=""24"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Program+&lt;Foo&gt;d__0"" name=""MoveNext"">
      <customDebugInfo>
@@ -180,7 +172,6 @@ System.Collections.Generic.IEnumerable<int> Foo()
        <entry offset=""0x34"" hidden=""true"" document=""0"" />
        <entry offset=""0x3b"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -217,7 +208,6 @@ System.Collections.Generic.IEnumerable<int> IEI<T>(int i0, int i1)
        <forwardIterator name=""&lt;IEI&gt;d__0"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Program"" name=""F"">
      <customDebugInfo>
@@ -228,7 +218,6 @@ System.Collections.Generic.IEnumerable<int> IEI<T>(int i0, int i1)
      <sequencePoints>
        <entry offset=""0x0"" startLine=""17"" startColumn=""23"" endLine=""17"" endColumn=""24"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Program+&lt;IEI&gt;d__0`1"" name=""MoveNext"">
      <customDebugInfo>
@@ -252,7 +241,6 @@ System.Collections.Generic.IEnumerable<int> IEI<T>(int i0, int i1)
        <entry offset=""0xab"" hidden=""true"" document=""0"" />
        <entry offset=""0xb2"" startLine=""14"" startColumn=""9"" endLine=""14"" endColumn=""21"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -293,7 +281,6 @@ System.Collections.Generic.IEnumerable<int> IEI<T>(int i0, int i1)
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Program"" name=""F"">
      <customDebugInfo>
@@ -305,7 +292,6 @@ System.Collections.Generic.IEnumerable<int> IEI<T>(int i0, int i1)
        <entry offset=""0x0"" startLine=""17"" startColumn=""21"" endLine=""17"" endColumn=""22"" document=""0"" />
        <entry offset=""0x1"" startLine=""17"" startColumn=""23"" endLine=""17"" endColumn=""24"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Program+&lt;IEI&gt;d__0`1"" name=""MoveNext"">
      <customDebugInfo>
@@ -336,7 +322,6 @@ System.Collections.Generic.IEnumerable<int> IEI<T>(int i0, int i1)
        <entry offset=""0xd0"" startLine=""13"" startColumn=""9"" endLine=""13"" endColumn=""10"" document=""0"" />
        <entry offset=""0xd1"" startLine=""14"" startColumn=""9"" endLine=""14"" endColumn=""21"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -380,7 +365,6 @@ public static IEnumerator<T> M(IEnumerable<T> items)
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Test`1"" name=""F"">
      <customDebugInfo>
@@ -392,7 +376,6 @@ public static IEnumerator<T> M(IEnumerable<T> items)
        <entry offset=""0x0"" startLine=""19"" startColumn=""21"" endLine=""19"" endColumn=""22"" document=""0"" />
        <entry offset=""0x1"" startLine=""19"" startColumn=""23"" endLine=""19"" endColumn=""24"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x2"">
        <namespace name=""System"" />
        <namespace name=""System.Collections.Generic"" />
@@ -431,7 +414,6 @@ public static IEnumerator<T> M(IEnumerable<T> items)
        <entry offset=""0xde"" startLine=""17"" startColumn=""5"" endLine=""17"" endColumn=""6"" document=""0"" />
        <entry offset=""0xe2"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -480,7 +462,6 @@ static void Main()
        <forwardIterator name=""&lt;M&gt;d__0"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""C"" name=""Main"">
      <customDebugInfo>
@@ -497,7 +478,6 @@ static void Main()
        <entry offset=""0x27"" hidden=""true"" document=""0"" />
        <entry offset=""0x31"" startLine=""25"" startColumn=""5"" endLine=""25"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x32"">
        <namespace name=""System.Collections.Generic"" />
      </scope>
@@ -516,11 +496,6 @@ static void Main()
        <entry offset=""0x80"" hidden=""true"" document=""0"" />
        <entry offset=""0x87"" startLine=""16"" startColumn=""9"" endLine=""16"" endColumn=""21"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <constant name=""d1"" value=""0.1"" type=""Decimal"" />
-        <constant name=""dx"" value=""1.23"" type=""Decimal"" />
-        <constant name=""d2"" value=""0.2"" type=""Decimal"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x89"">
        <scope startOffset=""0x26"" endOffset=""0x89"">
          <constant name=""d1"" value=""0.1"" type=""Decimal"" />
@@ -605,7 +580,6 @@ public static void Main()
        <entry offset=""0x1"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""32"" document=""0"" />
        <entry offset=""0xa"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0xc"">
        <namespace name=""System"" />
        <namespace name=""System.Collections"" />
@@ -623,21 +597,18 @@ public static void Main()
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Test`1"" name=""get_IterProp"">
      <customDebugInfo>
        <forwardIterator name=""&lt;get_IterProp&gt;d__3"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Test`1"" name=""IterMethod"">
      <customDebugInfo>
        <forwardIterator name=""&lt;IterMethod&gt;d__4"" />
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
    <method containingType=""Test"" name=""Main"">
      <customDebugInfo>
@@ -659,9 +630,6 @@ public static void Main()
        <entry offset=""0x22"" hidden=""true"" document=""0"" />
        <entry offset=""0x2d"" startLine=""47"" startColumn=""5"" endLine=""47"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""v"" il_index=""1"" il_start=""0xf"" il_end=""0x18"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x2e"">
        <scope startOffset=""0xf"" endOffset=""0x18"">
          <local name=""v"" il_index=""1"" il_start=""0xf"" il_end=""0x18"" attributes=""0"" />
@@ -707,7 +675,6 @@ public static void Main()
        <entry offset=""0x12a"" startLine=""23"" startColumn=""5"" endLine=""23"" endColumn=""6"" document=""0"" />
        <entry offset=""0x12e"" hidden=""true"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Test`1+&lt;get_IterProp&gt;d__3"" name=""MoveNext"">
      <customDebugInfo>
@@ -726,7 +693,6 @@ public static void Main()
        <entry offset=""0x62"" hidden=""true"" document=""0"" />
        <entry offset=""0x69"" startLine=""31"" startColumn=""9"" endLine=""31"" endColumn=""10"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
    <method containingType=""Test`1+&lt;IterMethod&gt;d__4"" name=""MoveNext"">
      <customDebugInfo>
@@ -745,7 +711,6 @@ public static void Main()
        <entry offset=""0x62"" hidden=""true"" document=""0"" />
        <entry offset=""0x69"" startLine=""38"" startColumn=""9"" endLine=""38"" endColumn=""21"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -809,7 +774,6 @@ static IEnumerable<T> F<T>(T[] o)
        <entry offset=""0x80"" hidden=""true"" document=""0"" />
        <entry offset=""0x87"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x8b"">
        <namespace name=""System.Collections.Generic"" />
      </scope>
@@ -924,7 +888,6 @@ .maxstack  2
        <entry offset=""0x45"" startLine=""12"" startColumn=""9"" endLine=""12"" endColumn=""10"" document=""0"" />
        <entry offset=""0x46"" startLine=""13"" startColumn=""5"" endLine=""13"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x4a"">
        <namespace name=""System.Collections.Generic"" />
      </scope>
@@ -1029,7 +992,6 @@ public IEnumerable<int> M(IDisposable disposable)
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1099,7 +1061,6 @@ static IEnumerable<int> M()
        <entry offset=""0xee"" hidden=""true"" document=""0"" />
        <entry offset=""0xf5"" startLine=""17"" startColumn=""5"" endLine=""17"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1209,7 +1170,6 @@ .locals init (int V_0)
        <entry offset=""0x51"" hidden=""true"" document=""0"" />
        <entry offset=""0x58"" startLine=""16"" startColumn=""5"" endLine=""16"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1227,7 +1187,6 @@ .locals init (int V_0)
        </encLambdaMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1364,7 +1323,6 @@ .maxstack  2
        <entry offset=""0x7a"" hidden=""true"" document=""0"" />
        <entry offset=""0x81"" startLine=""19"" startColumn=""5"" endLine=""19"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1385,7 +1343,6 @@ .maxstack  2
        </encLambdaMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1447,7 +1404,6 @@ static IEnumerable<int> M()
        <entry offset=""0x8d"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""22"" document=""0"" />
        <entry offset=""0xe5"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1463,7 +1419,6 @@ static IEnumerable<int> M()
        </encLocalSlotMap>
      </customDebugInfo>
      <sequencePoints />
-      <locals />
    </method>
  </methods>
 </symbols>
@@ -1517,9 +1472,6 @@ static IEnumerable<int> M()
        <entry offset=""0x6d"" hidden=""true"" document=""0"" />
        <entry offset=""0x74"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""d"" il_index=""1"" il_start=""0x17"" il_end=""0x76"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x76"">
        <scope startOffset=""0x17"" endOffset=""0x76"">
          <local name=""d"" il_index=""1"" il_start=""0x17"" il_end=""0x76"" attributes=""0"" />
@@ -1584,7 +1536,6 @@ static IEnumerable<int> M()
        <entry offset=""0x86"" hidden=""true"" document=""0"" />
        <entry offset=""0x8d"" startLine=""13"" startColumn=""5"" endLine=""13"" endColumn=""6"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");
@@ -1629,7 +1580,6 @@ static IEnumerable<int> F()
        <entry offset=""0x19"" startLine=""15"" startColumn=""5"" endLine=""15"" endColumn=""6"" document=""0"" />
        <entry offset=""0x1a"" startLine=""16"" startColumn=""9"" endLine=""16"" endColumn=""31"" document=""0"" />
      </sequencePoints>
-      <locals />
    </method>
  </methods>
 </symbols>");

--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBLambdaTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBLambdaTests.cs
--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBTests.cs
--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBUsingTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBUsingTests.cs
--- a/src/Compilers/Core/Portable/PEWriter/PdbWriter.cs
+++ b/src/Compilers/Core/Portable/PEWriter/PdbWriter.cs
@@ -111,9 +111,8 @@ public void SerializeDebugInfo(IMethodBody methodBody, uint localSignatureToken,

            var localScopes = methodBody.LocalScopes;

-            // CCI originally didn't have the notion of the default scope that is open
-            // when a method is opened. In order to reproduce CSC PDBs, this must be added. Otherwise
-            // a seemingly unnecessary scope that contains only other scopes is put in the PDB.
+            // Open the outer-most language defined scope, the namespace scopes will be emitted to it.
+            // Note that the root scope has already been open, but native compilers leave it empty.
            if (localScopes.Length > 0)
            {
                this.DefineScopeLocals(localScopes[0], localSignatureToken);
@@ -175,10 +174,7 @@ public void SerializeDebugInfo(IMethodBody methodBody, uint localSignatureToken,
                this.DefineAssemblyReferenceAliases();
            }

-            // TODO: it's not clear why we are closing a scope here with IL length:
-            CloseScope(methodBody.IL.Length);
-
-            CloseMethod();
+            CloseMethod(methodBody.IL.Length);
        }

        private void DefineNamespaceScopes(IMethodBody methodBody)
@@ -678,7 +674,9 @@ private void OpenMethod(uint methodToken)
            try
            {
                _symWriter.OpenMethod(methodToken);
-                _symWriter.OpenScope(0);
+
+                // open root scope:
+                _symWriter.OpenScope(startOffset: 0);
            }
            catch (Exception ex)
            {
@@ -686,10 +684,13 @@ private void OpenMethod(uint methodToken)
            }
        }

-        private void CloseMethod()
+        private void CloseMethod(int ilLength)
        {
            try
            {
+                // close the root scope:
+                CloseScope(endOffset: ilLength);
+
                _symWriter.CloseMethod();
            }
            catch (Exception ex)
@@ -710,11 +711,11 @@ private void OpenScope(int offset)
            }
        }

-        private void CloseScope(int offset)
+        private void CloseScope(int endOffset)
        {
            try
            {
-                _symWriter.CloseScope((uint)offset);
+                _symWriter.CloseScope((uint)endOffset);
            }
            catch (Exception ex)
            {

--- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenVBCore.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenVBCore.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports System.IO
 Imports System.Text
@@ -2573,9 +2573,6 @@ End Class
                <entry offset="0x4" startLine="7" startColumn="9" endLine="7" endColumn="32" document="1"/>
                <entry offset="0x10" startLine="8" startColumn="5" endLine="8" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="ch" il_index="0" il_start="0x0" il_end="0x11" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x11">
                <namespace name="System" importlevel="file"/>
                <namespace name="Microsoft.VisualBasic" importlevel="file"/>

--- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinueStateMachineTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinueStateMachineTests.vb
@@ -362,7 +362,6 @@ End Class
                <entry offset="0x25" startLine="7" startColumn="9" endLine="7" endColumn="16" document="1"/>
                <entry offset="0x40" startLine="8" startColumn="5" endLine="8" endColumn="17" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x42">
                <namespace name="System.Collections.Generic" importlevel="file"/>
                <currentnamespace name=""/>
@@ -676,7 +675,6 @@ End Class
                <entry offset="0xa6" startLine="6" startColumn="5" endLine="6" endColumn="17" document="1"/>
                <entry offset="0xb0" hidden="true" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0xbe">
                <namespace name="System.Threading.Tasks" importlevel="file"/>
                <currentnamespace name=""/>

--- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports System.Collections.Immutable
 Imports System.IO
@@ -1429,11 +1429,6 @@ End Class
                <entry offset="0x21" startLine="13" startColumn="9" endLine="13" endColumn="13" document="0"/>
                <entry offset="0x28" startLine="14" startColumn="5" endLine="14" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="z" il_index="3" il_start="0x0" il_end="0x29" attributes="0"/>
-                <local name="y" il_index="1" il_start="0x0" il_end="0x29" attributes="0"/>
-                <local name="w" il_index="4" il_start="0x0" il_end="0x29" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x29">
                <currentnamespace name=""/>
                <local name="z" il_index="3" il_start="0x0" il_end="0x29" attributes="0"/>
@@ -1483,10 +1478,6 @@ End Class
                <entry offset="0x1b" startLine="12" startColumn="9" endLine="12" endColumn="13" document="0"/>
                <entry offset="0x22" startLine="13" startColumn="5" endLine="13" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="x" il_index="5" il_start="0x0" il_end="0x23" attributes="0"/>
-                <local name="z" il_index="3" il_start="0x0" il_end="0x23" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x23">
                <currentnamespace name=""/>
                <local name="x" il_index="5" il_start="0x0" il_end="0x23" attributes="0"/>
@@ -1543,10 +1534,6 @@ End Class
                <entry offset="0x19" startLine="18" startColumn="9" endLine="18" endColumn="13" document="0"/>
                <entry offset="0x25" startLine="19" startColumn="5" endLine="19" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="c" il_index="2" il_start="0x0" il_end="0x26" attributes="0"/>
-                <local name="b" il_index="1" il_start="0x0" il_end="0x26" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x26">
                <currentnamespace name=""/>
                <local name="c" il_index="2" il_start="0x0" il_end="0x26" attributes="0"/>
@@ -1632,10 +1619,6 @@ End Class
                <entry offset="0x3" startLine="4" startColumn="13" endLine="4" endColumn="29" document="0"/>
                <entry offset="0x9" startLine="5" startColumn="5" endLine="5" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="a" il_index="2" il_start="0x0" il_end="0xa" attributes="0"/>
-                <local name="b" il_index="1" il_start="0x0" il_end="0xa" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0xa">
                <currentnamespace name=""/>
                <local name="a" il_index="2" il_start="0x0" il_end="0xa" attributes="0"/>

--- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports System.Collections.Immutable
 Imports Microsoft.CodeAnalysis.CodeGen
@@ -110,10 +110,6 @@ End Class
        <entry offset=""0x29"" hidden=""true"" document=""1"" />
        <entry offset=""0x35"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""12"" document=""1"" />
      </sequencePoints>
-      <locals>
-        <local name=""index"" il_index=""1"" il_start=""0x1"" il_end=""0x18"" attributes=""0"" />
-        <local name=""index"" il_index=""4"" il_start=""0x19"" il_end=""0x34"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x36"">
        <namespace name=""System"" importlevel=""file"" />
        <currentnamespace name="""" />
@@ -239,7 +235,6 @@ End Class
        <entry offset=""0xb"" startLine=""9"" startColumn=""9"" endLine=""9"" endColumn=""18"" document=""1"" />
        <entry offset=""0x1c"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""12"" document=""1"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x1d"">
        <importsforward declaringType=""C"" methodName=""F"" />
      </scope>
@@ -261,7 +256,6 @@ End Class
        <entry offset=""0x9"" startLine=""9"" startColumn=""9"" endLine=""9"" endColumn=""18"" document=""1"" />
        <entry offset=""0x13"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""12"" document=""1"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x14"">
        <importsforward declaringType=""C"" methodName=""F"" />
      </scope>
@@ -596,7 +590,6 @@ End Class
        <entry offset=""0xd"" startLine=""13"" startColumn=""21"" endLine=""13"" endColumn=""30"" document=""1"" />
        <entry offset=""0x1e"" startLine=""14"" startColumn=""17"" endLine=""14"" endColumn=""29"" document=""1"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0x20"">
        <importsforward declaringType=""C"" methodName=""F"" />
      </scope>
@@ -806,7 +799,6 @@ End Class
        <entry offset=""0xb3"" startLine=""12"" startColumn=""9"" endLine=""12"" endColumn=""16"" document=""1"" />
        <entry offset=""0xce"" startLine=""13"" startColumn=""5"" endLine=""13"" endColumn=""17"" document=""1"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0xd2"">
        <importsforward declaringType=""C"" methodName=""F"" />
      </scope>
@@ -1012,7 +1004,6 @@ End Class
        <entry offset=""0xe4"" startLine=""12"" startColumn=""5"" endLine=""12"" endColumn=""17"" document=""1"" />
        <entry offset=""0xee"" hidden=""true"" document=""1"" />
      </sequencePoints>
-      <locals />
      <scope startOffset=""0x0"" endOffset=""0xfc"">
        <importsforward declaringType=""C"" methodName=""F"" />
      </scope>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb
@@ -204,7 +204,6 @@ End Class
                <entry offset="0x0" startLine="3" startColumn="5" endLine="3" endColumn="10" document="1"/>
                <entry offset="0x1" startLine="4" startColumn="5" endLine="4" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x2">
                <currentnamespace name=""/>
            </scope>
@@ -265,7 +264,6 @@ End Class
                <entry offset="0x24" startLine="5" startColumn="9" endLine="5" endColumn="12" document="3"/>
                <entry offset="0x2b" hidden="true" document="3"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x2c">
                <currentnamespace name=""/>
            </scope>
@@ -333,7 +331,6 @@ End Class
                <entry offset="0x24" startLine="5" startColumn="9" endLine="5" endColumn="12" document="6"/>
                <entry offset="0x2b" hidden="true" document="6"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x2c">
                <currentnamespace name=""/>
            </scope>
@@ -387,7 +384,6 @@ End Class
                <entry offset="0x16" startLine="3" startColumn="9" endLine="3" endColumn="12" document="4"/>
                <entry offset="0x1d" hidden="true" document="4"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x1e">
                <currentnamespace name=""/>
            </scope>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBAsyncTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBAsyncTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports Microsoft.CodeAnalysis.Test.Utilities
 Imports Roslyn.Test.Utilities
@@ -54,7 +54,6 @@ End Module
                <forwardIterator name="VB$StateMachine_1_F"/>
            </customDebugInfo>
            <sequencePoints/>
-            <locals/>
        </method>
    </methods>
 </symbols>)
@@ -87,7 +86,6 @@ End Module
                <entry offset="0xa8" startLine="14" startColumn="5" endLine="14" endColumn="17" document="0"/>
                <entry offset="0xb2" hidden="true" document="0"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0xc0">
                <importsforward declaringType="Module1" methodName="Main" parameterNames="args"/>
            </scope>
@@ -107,7 +105,6 @@ End Module
                <forwardIterator name="VB$StateMachine_2_Test"/>
            </customDebugInfo>
            <sequencePoints/>
-            <locals/>
        </method>
    </methods>
 </symbols>)
@@ -162,7 +159,6 @@ End Module
                <entry offset="0x51c" startLine="24" startColumn="5" endLine="24" endColumn="17" document="0"/>
                <entry offset="0x526" hidden="true" document="0"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x533">
                <importsforward declaringType="Module1" methodName="Main" parameterNames="args"/>
            </scope>
@@ -190,7 +186,6 @@ End Module
                <forwardIterator name="VB$StateMachine_3_S"/>
            </customDebugInfo>
            <sequencePoints/>
-            <locals/>
        </method>
    </methods>
 </symbols>)
@@ -221,7 +216,6 @@ End Module
                <entry offset="0xa3" startLine="28" startColumn="5" endLine="28" endColumn="12" document="0"/>
                <entry offset="0xad" hidden="true" document="0"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0xba">
                <importsforward declaringType="Module1" methodName="Main" parameterNames="args"/>
            </scope>
@@ -296,10 +290,6 @@ End Class
                <entry offset="0x126" startLine="14" startColumn="5" endLine="14" endColumn="17" document="0"/>
                <entry offset="0x130" hidden="true" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$ResumableLocal_$VB$Closure_$0" il_index="0" il_start="0x12" il_end="0x100" attributes="0"/>
-                <local name="$VB$ResumableLocal_a$1" il_index="1" il_start="0x12" il_end="0x100" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x13d">
                <importsforward declaringType="C+_Closure$__1-0" methodName="_Lambda$__0"/>
                <scope startOffset="0x12" endOffset="0x100">
@@ -365,9 +355,6 @@ End Class
                <entry offset="0xf9" startLine="14" startColumn="5" endLine="14" endColumn="17" document="0"/>
                <entry offset="0x103" hidden="true" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$ResumableLocal_$VB$Closure_$0" il_index="0" il_start="0xa" il_end="0xd6" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x10f">
                <importsforward declaringType="C+_Closure$__1-0" methodName="_Lambda$__0"/>
                <scope startOffset="0xa" endOffset="0xd6">
@@ -440,10 +427,6 @@ End Class
                <entry offset="0xe3" startLine="12" startColumn="5" endLine="12" endColumn="17" document="0"/>
                <entry offset="0xed" hidden="true" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$ResumableLocal_x$0" il_index="0" il_start="0xf" il_end="0xbd" attributes="0"/>
-                <local name="$VB$ResumableLocal_y$1" il_index="1" il_start="0xf" il_end="0xbd" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0xfa">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Threading.Tasks" importlevel="file"/>
@@ -508,10 +491,6 @@ End Class
                <entry offset="0xcd" startLine="12" startColumn="5" endLine="12" endColumn="17" document="0"/>
                <entry offset="0xd7" hidden="true" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$ResumableLocal_x$0" il_index="0" il_start="0xa" il_end="0xaa" attributes="0"/>
-                <local name="$VB$ResumableLocal_y$1" il_index="1" il_start="0xa" il_end="0xaa" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0xe3">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Threading.Tasks" importlevel="file"/>
@@ -572,7 +551,6 @@ End Class
                <entry offset="0x2f" startLine="7" startColumn="5" endLine="7" endColumn="17" document="0"/>
                <entry offset="0x39" hidden="true" document="0"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x47">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Threading.Tasks" importlevel="file"/>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBCollectionInitializerTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBCollectionInitializerTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB
    Public Class PDBCollectionInitializerTests
@@ -46,9 +46,6 @@ End Class
                <entry offset="0x1" startLine="10" startColumn="13" endLine="10" endColumn="91" document="0"/>
                <entry offset="0x2a" startLine="11" startColumn="5" endLine="11" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="aList1" il_index="0" il_start="0x0" il_end="0x2b" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x2b">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -104,9 +101,6 @@ End Class
                <entry offset="0x1" startLine="10" startColumn="13" endLine="10" endColumn="73" document="0"/>
                <entry offset="0x2a" startLine="11" startColumn="5" endLine="11" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="aList2" il_index="0" il_start="0x0" il_end="0x2b" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x2b">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -160,9 +154,6 @@ End Class
                <entry offset="0x1" startLine="10" startColumn="13" endLine="10" endColumn="107" document="0"/>
                <entry offset="0x2c" startLine="11" startColumn="5" endLine="11" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="aList1" il_index="0" il_start="0x0" il_end="0x2d" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x2d">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -220,10 +211,6 @@ End Class
                <entry offset="0x2a" startLine="10" startColumn="21" endLine="10" endColumn="27" document="0"/>
                <entry offset="0x53" startLine="11" startColumn="5" endLine="11" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="aList1" il_index="0" il_start="0x0" il_end="0x54" attributes="0"/>
-                <local name="aList2" il_index="1" il_start="0x0" il_end="0x54" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x54">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports Roslyn.Test.Utilities
 Imports System.Xml.Linq
@@ -39,10 +39,6 @@ end class
                <entry offset="0x1" startLine="6" startColumn="9" endLine="6" endColumn="33" document="0"/>
                <entry offset="0x8" startLine="7" startColumn="5" endLine="7" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <constant name="x" value="1" type="Int32"/>
-                <constant name="y" value="2" type="Int32"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x9">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -93,9 +89,6 @@ end class
                <entry offset="0x1" startLine="5" startColumn="9" endLine="11" endColumn="11" document="0"/>
                <entry offset="0x2c" startLine="12" startColumn="5" endLine="12" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <constant name="x" value="1" type="Int32"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x2d">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -108,10 +101,6 @@ end class
                <entry offset="0x1" startLine="9" startColumn="17" endLine="9" endColumn="45" document="0"/>
                <entry offset="0x8" startLine="10" startColumn="13" endLine="10" endColumn="20" document="0"/>
            </sequencePoints>
-            <locals>
-                <constant name="y" value="2" type="Int32"/>
-                <constant name="z" value="3" type="Int32"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x9">
                <importsforward declaringType="C" methodName="M" parameterNames="a"/>
                <constant name="y" value="2" type="Int32"/>
@@ -177,14 +166,6 @@ End Class
                <entry offset="0x0" startLine="3" startColumn="5" endLine="3" endColumn="12" document="0"/>
                <entry offset="0x1" startLine="10" startColumn="5" endLine="10" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <constant name="o" value="null" type="Object"/>
-                <constant name="s" value="hello" type="String"/>
-                <constant name="f" value="-3.402823E+38" type="Single"/>
-                <constant name="d" value="1.79769313486232E+308" type="Double"/>
-                <constant name="dec" value="1.5" type="Decimal"/>
-                <constant name="dt" value="02/29/2012 00:00:00" type="DateTime"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x2">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBExternalSourceDirectiveTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBExternalSourceDirectiveTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports Roslyn.Test.Utilities

@@ -63,9 +63,6 @@ End Class
                <entry offset="0x7" hidden="true" document="1"/>
                <entry offset="0x18" hidden="true" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="str" il_index="0" il_start="0x0" il_end="0x19" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x19">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -81,7 +78,6 @@ End Class
                <entry offset="0x17" hidden="true" document="2"/>
                <entry offset="0x22" hidden="true" document="2"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x23">
                <importsforward declaringType="C1" methodName="FooInvisible"/>
            </scope>
@@ -163,9 +159,6 @@ End Class
                <entry offset="0x7" hidden="true" document="1"/>
                <entry offset="0x18" hidden="true" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="str" il_index="0" il_start="0x0" il_end="0x19" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x19">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -204,9 +197,6 @@ End Class
                <entry offset="0x9d" hidden="true" document="3"/>
                <entry offset="0xa9" hidden="true" document="3"/>
            </sequencePoints>
-            <locals>
-                <local name="i" il_index="0" il_start="0x0" il_end="0xaa" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0xaa">
                <importsforward declaringType="C1" methodName="FooInvisible"/>
                <local name="i" il_index="0" il_start="0x0" il_end="0xaa" attributes="0"/>
@@ -273,9 +263,6 @@ End Class
                <entry offset="0x7" startLine="11" startColumn="9" endLine="11" endColumn="42" document="1"/>
                <entry offset="0x18" startLine="12" startColumn="5" endLine="12" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="str" il_index="0" il_start="0x0" il_end="0x19" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x19">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -290,7 +277,6 @@ End Class
                <entry offset="0xc" startLine="20" startColumn="9" endLine="20" endColumn="41" document="1"/>
                <entry offset="0x17" startLine="21" startColumn="5" endLine="21" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x18">
                <importsforward declaringType="C1" methodName="FooInvisible"/>
            </scope>
@@ -362,9 +348,6 @@ End Class
                <entry offset="0x7" startLine="11" startColumn="9" endLine="11" endColumn="42" document="1"/>
                <entry offset="0x18" startLine="12" startColumn="5" endLine="12" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="str" il_index="0" il_start="0x0" il_end="0x19" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x19">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -379,7 +362,6 @@ End Class
                <entry offset="0xc" startLine="23" startColumn="9" endLine="23" endColumn="41" document="1"/>
                <entry offset="0x17" startLine="27" startColumn="5" endLine="27" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x18">
                <importsforward declaringType="C1" methodName="FooInvisible"/>
            </scope>
@@ -452,9 +434,6 @@ End Class
                <entry offset="0x7" hidden="true" document="1"/>
                <entry offset="0x18" hidden="true" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="str" il_index="0" il_start="0x0" il_end="0x19" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x19">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -469,7 +448,6 @@ End Class
                <entry offset="0xc" hidden="true" document="1"/>
                <entry offset="0x17" hidden="true" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x18">
                <importsforward declaringType="C1" methodName="FooInvisible"/>
            </scope>
@@ -545,9 +523,6 @@ End Class
                <entry offset="0x7" hidden="true" document="1"/>
                <entry offset="0x18" hidden="true" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="str" il_index="0" il_start="0x0" il_end="0x19" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x19">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -563,7 +538,6 @@ End Class
                <entry offset="0x17" hidden="true" document="1"/>
                <entry offset="0x22" hidden="true" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x23">
                <importsforward declaringType="C1" methodName="FooInvisible"/>
            </scope>
@@ -657,7 +631,6 @@ End Class
                <entry offset="0x6" startLine="46" startColumn="12" endLine="46" endColumn="30" document="2"/>
                <entry offset="0xe" startLine="27" startColumn="36" endLine="27" endColumn="54" document="3"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x17">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -670,7 +643,6 @@ End Class
                <entry offset="0xd" startLine="12" startColumn="9" endLine="12" endColumn="30" document="2"/>
                <entry offset="0x19" startLine="13" startColumn="5" endLine="13" endColumn="12" document="2"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x1a">
                <importsforward declaringType="C1" methodName=".ctor"/>
            </scope>
@@ -687,9 +659,6 @@ End Class
                <entry offset="0x7" startLine="3" startColumn="9" endLine="3" endColumn="23" document="2"/>
                <entry offset="0xe" startLine="4" startColumn="5" endLine="4" endColumn="12" document="2"/>
            </sequencePoints>
-            <locals>
-                <local name="c" il_index="0" il_start="0x0" il_end="0xf" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0xf">
                <importsforward declaringType="C1" methodName=".ctor"/>
                <local name="c" il_index="0" il_start="0x0" il_end="0xf" attributes="0"/>
@@ -700,7 +669,6 @@ End Class
                <entry offset="0x0" hidden="true" document="1"/>
                <entry offset="0x6" hidden="true" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0xf">
                <importsforward declaringType="C1" methodName=".ctor"/>
            </scope>
@@ -885,7 +853,6 @@ End Module
                                           <entry offset="0x4e" hidden="true" document="2"/>
                                           <entry offset="0x59" hidden="true" document="2"/>
                                       </sequencePoints>
-                                       <locals/>
                                       <scope startOffset="0x0" endOffset="0x5a">
                                           <namespace name="System" importlevel="file"/>
                                           <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -933,7 +900,6 @@ End Class
                                           <entry offset="0x1" startLine="4" startColumn="2" endLine="4" endColumn="8" document="2"/>
                                           <entry offset="0x8" hidden="true" document="2"/>
                                       </sequencePoints>
-                                       <locals/>
                                       <scope startOffset="0x0" endOffset="0x9">
                                           <currentnamespace name=""/>
                                       </scope>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBForEachTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBForEachTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports Microsoft.CodeAnalysis.Test.Utilities
 Imports Roslyn.Test.Utilities
@@ -53,10 +53,6 @@ End Class
        <entry offset=""0x2f"" startLine=""7"" startColumn=""9"" endLine=""7"" endColumn=""21"" document=""0"" />
        <entry offset=""0x33"" startLine=""8"" startColumn=""5"" endLine=""8"" endColumn=""17"" document=""0"" />
      </sequencePoints>
-      <locals>
-        <local name=""M"" il_index=""0"" il_start=""0x0"" il_end=""0x35"" attributes=""0"" />
-        <local name=""o"" il_index=""3"" il_start=""0x7"" il_end=""0x22"" attributes=""0"" />
-      </locals>
      <scope startOffset=""0x0"" endOffset=""0x35"">
        <currentnamespace name="""" />
        <local name=""M"" il_index=""0"" il_start=""0x0"" il_end=""0x35"" attributes=""0"" />
@@ -125,10 +121,6 @@ Imports System
                <entry offset="0x28" hidden="true" document="0"/>
                <entry offset="0x34" startLine="14" startColumn="13" endLine="14" endColumn="20" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="arr" il_index="0" il_start="0x0" il_end="0x35" attributes="0"/>
-                <local name="element" il_index="3" il_start="0x18" il_end="0x27" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x35">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -196,10 +188,6 @@ End Class
                <entry offset="0x21" hidden="true" document="0"/>
                <entry offset="0x30" startLine="12" startColumn="5" endLine="12" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="str" il_index="0" il_start="0x0" il_end="0x31" attributes="0"/>
-                <local name="element" il_index="3" il_start="0xd" il_end="0x20" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x31">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -278,9 +266,6 @@ End Structure
                <entry offset="0x1e" hidden="true" document="0"/>
                <entry offset="0x29" startLine="8" startColumn="5" endLine="8" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="x" il_index="1" il_start="0xe" il_end="0x1d" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x2a">
                <currentnamespace name=""/>
                <scope startOffset="0xe" endOffset="0x1d">
@@ -356,9 +341,6 @@ End Class
                <entry offset="0x3a" hidden="true" document="0"/>
                <entry offset="0x4a" startLine="11" startColumn="5" endLine="11" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="j" il_index="1" il_start="0x1f" il_end="0x2d" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x4b">
                <namespace name="System.Collections.Generic" importlevel="file"/>
                <namespace name="System" importlevel="file"/>
@@ -431,9 +413,6 @@ End Class
                <entry offset="0x33" hidden="true" document="0"/>
                <entry offset="0x4d" startLine="8" startColumn="5" endLine="8" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="x" il_index="1" il_start="0xe" il_end="0x26" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x4e">
                <currentnamespace name=""/>
                <scope startOffset="0xe" endOffset="0x26">
@@ -501,10 +480,6 @@ End Module
                <entry offset="0x13" hidden="true" document="0"/>
                <entry offset="0x1e" startLine="11" startColumn="5" endLine="11" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="myFArr" il_index="0" il_start="0x0" il_end="0x1f" attributes="0"/>
-                <local name="i" il_index="1" il_start="0x0" il_end="0x1f" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x1f">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -563,9 +538,6 @@ End Module
                <entry offset="0x2f" startLine="8" startColumn="5" endLine="8" endColumn="9" document="0"/>
                <entry offset="0x3c" startLine="9" startColumn="4" endLine="9" endColumn="11" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="i" il_index="1" il_start="0x1" il_end="0x3b" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x3d">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBIteratorTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBIteratorTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports Microsoft.CodeAnalysis.Test.Utilities
 Imports Roslyn.Test.Utilities
@@ -55,7 +55,6 @@ End Module
                <entry offset="0x4c" startLine="9" startColumn="17" endLine="9" endColumn="24" document="0"/>
                <entry offset="0x6c" startLine="10" startColumn="13" endLine="10" endColumn="25" document="0"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x6e">
                <importsforward declaringType="Program" methodName="Main" parameterNames="args"/>
            </scope>
@@ -138,11 +137,6 @@ End Module
                <entry offset="0x16d" hidden="true" document="0"/>
                <entry offset="0x187" startLine="26" startColumn="5" endLine="26" endColumn="17" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$ResumableLocal_arr$0" il_index="0" il_start="0x47" il_end="0x188" attributes="0"/>
-                <local name="$VB$ResumableLocal_x$3" il_index="3" il_start="0x73" il_end="0xd4" attributes="0"/>
-                <local name="$VB$ResumableLocal_x$6" il_index="6" il_start="0xfd" il_end="0x16c" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x189">
                <importsforward declaringType="Module1" methodName="Main"/>
                <scope startOffset="0x47" endOffset="0x188">
@@ -203,9 +197,6 @@ End Class
                <entry offset="0x85" startLine="13" startColumn="9" endLine="13" endColumn="21" document="0"/>
                <entry offset="0x96" startLine="14" startColumn="5" endLine="14" endColumn="17" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$ResumableLocal_$VB$Closure_$0" il_index="0" il_start="0x19" il_end="0x97" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x98">
                <importsforward declaringType="C+_Closure$__1-0" methodName="_Lambda$__0"/>
                <scope startOffset="0x19" endOffset="0x97">
@@ -255,9 +246,6 @@ End Class
                <entry offset="0x2d" startLine="11" startColumn="9" endLine="11" endColumn="20" document="0"/>
                <entry offset="0x54" startLine="12" startColumn="5" endLine="12" endColumn="17" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$Closure_0" il_index="1" il_start="0x19" il_end="0x55" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x56">
                <importsforward declaringType="C+_Closure$__1-0" methodName="_Lambda$__0"/>
                <scope startOffset="0x19" endOffset="0x55">
@@ -309,10 +297,6 @@ End Class
                <entry offset="0x5a" startLine="10" startColumn="9" endLine="10" endColumn="21" document="0"/>
                <entry offset="0x66" startLine="11" startColumn="5" endLine="11" endColumn="17" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$ResumableLocal_x$0" il_index="0" il_start="0x19" il_end="0x67" attributes="0"/>
-                <local name="$VB$ResumableLocal_y$1" il_index="1" il_start="0x19" il_end="0x67" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x68">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -365,10 +349,6 @@ End Class
                <entry offset="0x1d" startLine="8" startColumn="9" endLine="8" endColumn="20" document="0"/>
                <entry offset="0x3a" startLine="9" startColumn="5" endLine="9" endColumn="17" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="x" il_index="1" il_start="0x19" il_end="0x3b" attributes="0"/>
-                <local name="y" il_index="2" il_start="0x19" il_end="0x3b" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x3c">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -435,7 +415,6 @@ End Module
                <entry offset="0x4c" startLine="15" startColumn="9" endLine="15" endColumn="16" document="0"/>
                <entry offset="0x67" startLine="16" startColumn="5" endLine="16" endColumn="17" document="0"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x69">
                <importsforward declaringType="Module1" methodName="Main"/>
            </scope>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports Microsoft.CodeAnalysis.Test.Utilities
 Imports Roslyn.Test.Utilities
@@ -50,9 +50,6 @@ End Class
                <entry offset="0x26" startLine="6" startColumn="9" endLine="6" endColumn="12" document="1"/>
                <entry offset="0x2d" startLine="7" startColumn="5" endLine="7" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals>
-                <local name="d" il_index="0" il_start="0x0" il_end="0x2e" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x2e">
                <currentnamespace name=""/>
                <local name="d" il_index="0" il_start="0x0" il_end="0x2e" attributes="0"/>
@@ -68,7 +65,6 @@ End Class
                <entry offset="0x0" startLine="5" startColumn="22" endLine="5" endColumn="32" document="1"/>
                <entry offset="0x1" startLine="5" startColumn="33" endLine="5" endColumn="34" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0xc">
                <importsforward declaringType="C" methodName="Main"/>
            </scope>
@@ -146,11 +142,6 @@ End Module
                <entry offset="0x32" startLine="26" startColumn="21" endLine="26" endColumn="33" document="0"/>
                <entry offset="0x3f" startLine="27" startColumn="17" endLine="27" endColumn="24" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="$VB$Closure_0" il_index="0" il_start="0x0" il_end="0x40" attributes="0"/>
-                <local name="iii" il_index="1" il_start="0x0" il_end="0x40" attributes="0"/>
-                <local name="d2" il_index="2" il_start="0x0" il_end="0x40" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x40">
                <importsforward declaringType="M1" methodName="Main"/>
                <local name="$VB$Closure_0" il_index="0" il_start="0x0" il_end="0x40" attributes="0"/>
@@ -225,9 +216,6 @@ End Module
                <entry offset="0x4" startLine="7" startColumn="21" endLine="7" endColumn="29" document="0"/>
                <entry offset="0x8" startLine="8" startColumn="12" endLine="8" endColumn="24" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="r" il_index="1" il_start="0x0" il_end="0xa" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0xa">
                <importsforward declaringType="Module1" methodName="Main"/>
                <local name="r" il_index="1" il_start="0x0" il_end="0xa" attributes="0"/>
@@ -283,7 +271,6 @@ End Class
                <entry offset="0x6" startLine="3" startColumn="12" endLine="3" endColumn="49" document="1"/>
                <entry offset="0x30" startLine="3" startColumn="12" endLine="3" endColumn="49" document="2"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x5b">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -294,7 +281,6 @@ End Class
                <entry offset="0x0" startLine="5" startColumn="5" endLine="5" endColumn="15" document="1"/>
                <entry offset="0x1" startLine="6" startColumn="5" endLine="6" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x2">
                <importsforward declaringType="C" methodName=".ctor"/>
            </scope>
@@ -309,7 +295,6 @@ End Class
                <entry offset="0x0" startLine="3" startColumn="37" endLine="3" endColumn="47" document="1"/>
                <entry offset="0x1" startLine="3" startColumn="48" endLine="3" endColumn="49" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x7">
                <importsforward declaringType="C" methodName=".ctor"/>
            </scope>
@@ -324,7 +309,6 @@ End Class
                <entry offset="0x0" startLine="3" startColumn="37" endLine="3" endColumn="47" document="2"/>
                <entry offset="0x1" startLine="3" startColumn="48" endLine="3" endColumn="49" document="2"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x7">
                <importsforward declaringType="C" methodName=".ctor"/>
            </scope>
@@ -376,7 +360,6 @@ End Class
                <entry offset="0x6" startLine="3" startColumn="12" endLine="3" endColumn="49" document="1"/>
                <entry offset="0x30" startLine="10" startColumn="12" endLine="10" endColumn="49" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x5b">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -387,7 +370,6 @@ End Class
                <entry offset="0x0" startLine="5" startColumn="5" endLine="5" endColumn="15" document="1"/>
                <entry offset="0x1" startLine="6" startColumn="5" endLine="6" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x2">
                <importsforward declaringType="C" methodName=".ctor"/>
            </scope>
@@ -402,7 +384,6 @@ End Class
                <entry offset="0x0" startLine="3" startColumn="37" endLine="3" endColumn="47" document="1"/>
                <entry offset="0x1" startLine="3" startColumn="48" endLine="3" endColumn="49" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x7">
                <importsforward declaringType="C" methodName=".ctor"/>
            </scope>
@@ -417,7 +398,6 @@ End Class
                <entry offset="0x0" startLine="10" startColumn="37" endLine="10" endColumn="47" document="1"/>
                <entry offset="0x1" startLine="10" startColumn="48" endLine="10" endColumn="49" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x7">
                <importsforward declaringType="C" methodName=".ctor"/>
            </scope>
@@ -468,7 +448,6 @@ End Class
                <entry offset="0x1" startLine="3" startColumn="19" endLine="3" endColumn="56" document="2"/>
                <entry offset="0x16" startLine="4" startColumn="5" endLine="4" endColumn="12" document="1"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x17">
                <namespace name="System" importlevel="file"/>
                <currentnamespace name=""/>
@@ -484,7 +463,6 @@ End Class
                <entry offset="0x0" startLine="3" startColumn="44" endLine="3" endColumn="54" document="2"/>
                <entry offset="0x1" startLine="3" startColumn="55" endLine="3" endColumn="56" document="2"/>
            </sequencePoints>
-            <locals/>
            <scope startOffset="0x0" endOffset="0x7">
                <importsforward declaringType="C2" methodName=".cctor"/>
            </scope>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBNamespaceScopes.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBNamespaceScopes.vb
@@ -112,7 +112,6 @@ End Namespace
                                <entry offset="0x6" startLine="22" startColumn="12" endLine="22" endColumn="43" document="1"/>
                                <entry offset="0x16" startLine="16" startColumn="12" endLine="16" endColumn="43" document="2"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0x27">
                                <xmlnamespace prefix="file1" name="http://stuff/fromFile" importlevel="file"/>
                                <xmlnamespace prefix="" name="http://stuff/fromFile1" importlevel="file"/>
@@ -137,7 +136,6 @@ End Namespace
                                <entry offset="0x1" startLine="25" startColumn="9" endLine="25" endColumn="42" document="1"/>
                                <entry offset="0xc" startLine="26" startColumn="5" endLine="26" endColumn="12" document="1"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0xd">
                                <importsforward declaringType="Boo.C1" methodName=".ctor"/>
                            </scope>
@@ -148,7 +146,6 @@ End Namespace
                                <entry offset="0x1" startLine="29" startColumn="9" endLine="29" endColumn="48" document="1"/>
                                <entry offset="0xc" startLine="30" startColumn="5" endLine="30" endColumn="12" document="1"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0xd">
                                <importsforward declaringType="Boo.C1" methodName=".ctor"/>
                            </scope>
@@ -159,7 +156,6 @@ End Namespace
                                <entry offset="0x1" startLine="24" startColumn="9" endLine="24" endColumn="65" document="2"/>
                                <entry offset="0xc" startLine="25" startColumn="5" endLine="25" endColumn="12" document="2"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0xd">
                                <xmlnamespace prefix="file2" name="http://stuff/fromFile" importlevel="file"/>
                                <xmlnamespace prefix="" name="http://stuff/fromFile2" importlevel="file"/>
@@ -290,7 +286,6 @@ End Namespace
                                <entry offset="0x6" startLine="22" startColumn="12" endLine="22" endColumn="43" document="1"/>
                                <entry offset="0x16" startLine="16" startColumn="12" endLine="16" endColumn="43" document="2"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0x27">
                                <xmlnamespace prefix="file1" name="http://stuff/fromFile" importlevel="file"/>
                                <xmlnamespace prefix="" name="http://stuff/fromFile1" importlevel="file"/>
@@ -316,7 +311,6 @@ End Namespace
                                <entry offset="0x1" startLine="25" startColumn="9" endLine="25" endColumn="42" document="1"/>
                                <entry offset="0xc" startLine="26" startColumn="5" endLine="26" endColumn="12" document="1"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0xd">
                                <importsforward declaringType="DefaultNamespace.Boo.C1" methodName=".ctor"/>
                            </scope>
@@ -327,7 +321,6 @@ End Namespace
                                <entry offset="0x1" startLine="29" startColumn="9" endLine="29" endColumn="48" document="1"/>
                                <entry offset="0xc" startLine="30" startColumn="5" endLine="30" endColumn="12" document="1"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0xd">
                                <importsforward declaringType="DefaultNamespace.Boo.C1" methodName=".ctor"/>
                            </scope>
@@ -338,7 +331,6 @@ End Namespace
                                <entry offset="0x1" startLine="24" startColumn="9" endLine="24" endColumn="65" document="2"/>
                                <entry offset="0xc" startLine="25" startColumn="5" endLine="25" endColumn="12" document="2"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0xd">
                                <xmlnamespace prefix="file2" name="http://stuff/fromFile" importlevel="file"/>
                                <xmlnamespace prefix="" name="http://stuff/fromFile2" importlevel="file"/>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBObjectInitializerTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBObjectInitializerTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB
    Public Class PDBObjectInitializerTests
@@ -51,9 +51,6 @@ End Class
                <entry offset="0x1" startLine="15" startColumn="13" endLine="15" endColumn="78" document="0"/>
                <entry offset="0x19" startLine="16" startColumn="5" endLine="16" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="inst" il_index="0" il_start="0x0" il_end="0x1a" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x1a">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -114,9 +111,6 @@ End Class
                <entry offset="0x1" startLine="15" startColumn="13" endLine="15" endColumn="68" document="0"/>
                <entry offset="0x19" startLine="16" startColumn="5" endLine="16" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="inst" il_index="0" il_start="0x0" il_end="0x1a" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x1a">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -177,9 +171,6 @@ End Class
                <entry offset="0x1" startLine="14" startColumn="13" endLine="14" endColumn="90" document="0"/>
                <entry offset="0x1d" startLine="15" startColumn="5" endLine="15" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="inst" il_index="0" il_start="0x0" il_end="0x1e" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x1e">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -242,10 +233,6 @@ End Class
                <entry offset="0x19" startLine="15" startColumn="20" endLine="15" endColumn="25" document="0"/>
                <entry offset="0x31" startLine="16" startColumn="5" endLine="16" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="inst1" il_index="0" il_start="0x0" il_end="0x32" attributes="0"/>
-                <local name="inst2" il_index="1" il_start="0x0" il_end="0x32" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x32">
                <namespace name="System" importlevel="file"/>
                <namespace name="System.Collections.Generic" importlevel="file"/>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBSyncLockTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBSyncLockTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB

@@ -125,10 +125,6 @@ End Class
                <entry offset="0x4a" startLine="19" startColumn="9" endLine="19" endColumn="16" document="0"/>
                <entry offset="0x4b" startLine="20" startColumn="5" endLine="20" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="lock" il_index="0" il_start="0x2" il_end="0x3c" attributes="0"/>
-                <local name="x" il_index="3" il_start="0x21" il_end="0x29" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x4c">
                <importsforward declaringType="C1" methodName="Something" parameterNames="x"/>
                <scope startOffset="0x2" endOffset="0x3c">

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBTests.vb
--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBUsingTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBUsingTests.vb
-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports Microsoft.CodeAnalysis.Test.Utilities

@@ -70,11 +70,6 @@ End Class
                <entry offset="0x43" startLine="20" startColumn="9" endLine="20" endColumn="18" document="0"/>
                <entry offset="0x54" startLine="21" startColumn="5" endLine="21" endColumn="12" document="0"/>
            </sequencePoints>
-            <locals>
-                <local name="foo1" il_index="0" il_start="0x2" il_end="0x53" attributes="0"/>
-                <local name="foo2" il_index="1" il_start="0x2" il_end="0x53" attributes="0"/>
-                <local name="foo3" il_index="2" il_start="0x2" il_end="0x53" attributes="0"/>
-            </locals>
            <scope startOffset="0x0" endOffset="0x55">
                <importsforward declaringType="MyDisposable" methodName="Dispose"/>
                <scope startOffset="0x2" endOffset="0x53">
@@ -343,9 +338,6 @@ End Namespace
                                <entry offset="0x1" startLine="5" startColumn="17" endLine="5" endColumn="33" document="0"/>
                                <entry offset="0x3" startLine="6" startColumn="9" endLine="6" endColumn="16" document="0"/>
                            </sequencePoints>
-                            <locals>
-                                <local name="o" il_index="0" il_start="0x0" il_end="0x4" attributes="0"/>
-                            </locals>
                            <scope startOffset="0x0" endOffset="0x4">
                                <defunct name="&amp;PIA"/>
                                <currentnamespace name="N1"/>
@@ -357,7 +349,6 @@ End Namespace
                                <entry offset="0x0" startLine="12" startColumn="9" endLine="12" endColumn="23" document="0"/>
                                <entry offset="0x1" startLine="13" startColumn="9" endLine="13" endColumn="16" document="0"/>
                            </sequencePoints>
-                            <locals/>
                            <scope startOffset="0x0" endOffset="0x2">
                                <defunct name="&amp;PIA"/>
                                <currentnamespace name="N2"/>

--- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBVariableInitializerTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBVariableInitializerTests.vb
@@ -68,7 +68,6 @@ End Class
                    <entry offset="0x24" startLine="8" startColumn="16" endLine="8" endColumn="18" document="1"/>
                    <entry offset="0x2f" startLine="11" startColumn="36" endLine="11" endColumn="54" document="2"/>
                </sequencePoints>
-                <locals/>
                <scope startOffset="0x0" endOffset="0x38">
                    <namespace name="System" importlevel="file"/>
                    <currentnamespace name=""/>

--- a/src/Test/PdbUtilities/Pdb/PdbToXml.cs
+++ b/src/Test/PdbUtilities/Pdb/PdbToXml.cs
@@ -214,34 +214,20 @@ private void WriteMethod(MethodDefinitionHandle methodHandle)
            {
                WriteSequencePoints(method);

-                // TODO (tomat): Ideally this would be done in a separate test helper, not in PdbToXml.
-                // verify ISymUnmanagedMethod APIs:
-                var expectedSlotNames = new Dictionary<int, ImmutableArray<string>>();
-                WriteLocals(method, expectedSlotNames);
+                var rootScope = method.GetRootScope();

-                var actualSlotNames = method.GetLocalVariableSlots();
-
-                Debug.Assert(actualSlotNames.Length == (expectedSlotNames.Count == 0 ? 0 : expectedSlotNames.Keys.Max() + 1));
-
-                int i = 0;
-                foreach (var slotName in actualSlotNames)
+                // C# and VB compilers leave the root scope empty and put outermost lexical scope in it.
+                // Don't display such empty root scope.
+                if (rootScope.GetNamespaces().IsEmpty && rootScope.GetLocals().IsEmpty && rootScope.GetConstants().IsEmpty)
                {
-                    if (slotName == null)
-                    {
-                        Debug.Assert(!expectedSlotNames.ContainsKey(i));
-                    }
-                    else
+                    foreach (ISymUnmanagedScope child in rootScope.GetScopes())
                    {
-                        Debug.Assert(expectedSlotNames[i].Contains(slotName));
+                        WriteScope(child, isRoot: false);
                    }
-
-                    i++;
                }
-
-                ImmutableArray<ISymUnmanagedScope> children = method.GetRootScope().GetScopes();
-                if (children.Length != 0)
+                else
                {
-                    WriteScopes(children[0]);
+                    WriteScope(rootScope, isRoot: true);
                }

                WriteAsyncInfo(method);
@@ -655,26 +641,25 @@ private unsafe void WriteEditAndContinueLambdaMap(CustomDebugInfoRecord record)
            }
        }

-        private void WriteScopes(ISymUnmanagedScope scope)
+        private void WriteScope(ISymUnmanagedScope scope, bool isRoot)
        {
-            _writer.WriteStartElement("scope");
+            _writer.WriteStartElement(isRoot ? "rootScope" : "scope");
+            _writer.WriteAttributeString("startOffset", AsILOffset(scope.GetStartOffset()));
+            _writer.WriteAttributeString("endOffset", AsILOffset(scope.GetEndOffset()));
+
+            foreach (ISymUnmanagedNamespace @namespace in scope.GetNamespaces())
            {
-                _writer.WriteAttributeString("startOffset", AsILOffset(scope.GetStartOffset()));
-                _writer.WriteAttributeString("endOffset", AsILOffset(scope.GetEndOffset()));
-                {
-                    foreach (ISymUnmanagedNamespace @namespace in scope.GetNamespaces())
-                    {
-                        WriteNamespace(@namespace);
-                    }
+                WriteNamespace(@namespace);
+            }

-                    WriteLocalsHelper(scope, slotNames: null, includeChildScopes: false);
-                }
-                foreach (ISymUnmanagedScope child in scope.GetScopes())
-                {
-                    WriteScopes(child);
-                }
+            WriteLocals(scope);
+
+            foreach (ISymUnmanagedScope child in scope.GetScopes())
+            {
+                WriteScope(child, isRoot: false);
            }
-            _writer.WriteEndElement(); // </scope>
+
+            _writer.WriteEndElement(); 
        }

        private void WriteNamespace(ISymUnmanagedNamespace @namespace)
@@ -902,67 +887,22 @@ private void WriteAsyncInfo(ISymUnmanagedMethod method)
            _writer.WriteEndElement();
        }

-        // Write all the locals in the given method out to an XML file.
-        // Since the symbol store represents the locals in a recursive scope structure, we need to walk a tree.
-        // Although the locals are technically a hierarchy (based off nested scopes), it's easiest for clients
-        // if we present them as a linear list. We will provide the range for each local's scope so that somebody
-        // could reconstruct an approximation of the scope tree. The reconstruction may not be exact.
-        // (Note this would still break down if you had an empty scope nested in another scope.
-        private void WriteLocals(ISymUnmanagedMethod method, Dictionary<int, ImmutableArray<string>> slotNames)
-        {
-            _writer.WriteStartElement("locals");
-            // If there are no locals, then this element will just be empty.
-            WriteLocalsHelper(method.GetRootScope(), slotNames, includeChildScopes: true);
-            _writer.WriteEndElement();
-        }
-
-        private void WriteLocalsHelper(ISymUnmanagedScope scope, Dictionary<int, ImmutableArray<string>> slotNames, bool includeChildScopes)
+        private void WriteLocals(ISymUnmanagedScope scope)
        {
            foreach (ISymUnmanagedVariable l in scope.GetLocals())
            {
                _writer.WriteStartElement("local");
-                {
-                    _writer.WriteAttributeString("name", l.GetName());
-
-                    // Each local maps to a "IL Index" or "slot" number. 
-                    // The index is not necessarily unique. Several locals may refer to the same slot. 
-                    // It just means that the same local is known under different names inside the same or different scopes.
-                    // This index is what you pass to ICorDebugILFrame::GetLocalVariable() to get
-                    // a specific local variable. 
-                    // NOTE: VB emits "fake" locals for resumable locals which are actually backed by fields.
-                    //       These locals always map to the slot #0 which is just a valid number that is 
-                    //       not used. Only scoping information is used by EE in this case.
-                    int slot = l.GetSlot();
-                    _writer.WriteAttributeString("il_index", CultureInvariantToString(slot));
-
-                    bool reusingSlot = false;
-
-                    // collect slot names so that we can verify ISymUnmanagedReader APIs
-                    if (slotNames != null)
-                    {
-                        ImmutableArray<string> existingNames;
-                        if (slotNames.TryGetValue(slot, out existingNames))
-                        {
-                            slotNames[slot] = existingNames.Add(l.GetName());
-                            reusingSlot = true;
-                        }
-                        else
-                        {
-                            slotNames.Add(slot, ImmutableArray.Create(l.GetName()));
-                        }
-                    }
+                _writer.WriteAttributeString("name", l.GetName());

-                    // Provide scope range
-                    _writer.WriteAttributeString("il_start", AsILOffset(scope.GetStartOffset()));
-                    _writer.WriteAttributeString("il_end", AsILOffset(scope.GetEndOffset()));
-                    _writer.WriteAttributeString("attributes", CultureInvariantToString(l.GetAttributes()));
+                // NOTE: VB emits "fake" locals for resumable locals which are actually backed by fields.
+                //       These locals always map to the slot #0 which is just a valid number that is 
+                //       not used. Only scoping information is used by EE in this case.
+                _writer.WriteAttributeString("il_index", CultureInvariantToString(l.GetSlot()));

-                    if (reusingSlot)
-                    {
-                        _writer.WriteAttributeString("reusingslot", reusingSlot.ToString(CultureInfo.InvariantCulture));
-                    }
-                }
-                _writer.WriteEndElement(); // </local>
+                _writer.WriteAttributeString("il_start", AsILOffset(scope.GetStartOffset()));
+                _writer.WriteAttributeString("il_end", AsILOffset(scope.GetEndOffset()));
+                _writer.WriteAttributeString("attributes", CultureInvariantToString(l.GetAttributes()));
+                _writer.WriteEndElement();
            }

            foreach (ISymUnmanagedConstant constant in scope.GetConstants())
@@ -1056,14 +996,6 @@ private void WriteLocalsHelper(ISymUnmanagedScope scope, Dictionary<int, Immutab

                _writer.WriteEndElement();
            }
-
-            if (includeChildScopes)
-            {
-                foreach (ISymUnmanagedScope childScope in scope.GetScopes())
-                {
-                    WriteLocalsHelper(childScope, slotNames, includeChildScopes);
-                }
-            }
        }

        private static Type GetConstantRuntimeType(ImmutableArray<byte> signature)