From 94818712455b7277067083f8fe8bfef6f2cafc7e Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Thu, 9 Apr 2015 09:22:57 -0700 Subject: [PATCH] Clean up local scopes produced by PdbToXml and update tests accordingly --- .../Test/Emit/CodeGen/CodeGenAsyncEHTests.cs | 1 - .../Emit/CodeGen/CodeGenAsyncLocalsTests.cs | 1 - .../EditAndContinueStateMachineTests.cs | 2 - .../EditAndContinue/EditAndContinueTests.cs | 22 +- .../EditAndContinue/LocalSlotMappingTests.cs | 13 +- .../CSharp/Test/Emit/PDB/CheckSumTest.cs | 8 - .../CSharp/Test/Emit/PDB/PDBAsyncTests.cs | 41 +- .../CSharp/Test/Emit/PDB/PDBConstantTests.cs | 27 +- .../Test/Emit/PDB/PDBDynamicLocalsTests.cs | 167 +---- .../CSharp/Test/Emit/PDB/PDBIteratorTests.cs | 52 +- .../CSharp/Test/Emit/PDB/PDBLambdaTests.cs | 91 --- .../CSharp/Test/Emit/PDB/PDBTests.cs | 232 +------ .../CSharp/Test/Emit/PDB/PDBUsingTests.cs | 55 -- .../Core/Portable/PEWriter/PdbWriter.cs | 23 +- .../Test/Emit/CodeGen/CodeGenVBCore.vb | 5 +- .../EditAndContinueStateMachineTests.vb | 2 - .../EditAndContinue/EditAndContinueTests.vb | 19 +- .../EditAndContinue/LocalSlotMappingTests.vb | 11 +- .../Test/Emit/PDB/ChecksumTests.vb | 4 - .../Test/Emit/PDB/PDBAsyncTests.vb | 24 +- .../Emit/PDB/PDBCollectionInitializerTests.vb | 15 +- .../Test/Emit/PDB/PDBConstLocalTests.vb | 21 +- .../PDB/PDBExternalSourceDirectiveTests.vb | 36 +- .../Test/Emit/PDB/PDBForEachTests.vb | 30 +- .../Test/Emit/PDB/PDBIteratorTests.vb | 23 +- .../Test/Emit/PDB/PDBLambdaTests.vb | 24 +- .../Test/Emit/PDB/PDBNamespaceScopes.vb | 8 - .../Emit/PDB/PDBObjectInitializerTests.vb | 15 +- .../Test/Emit/PDB/PDBSyncLockTests.vb | 6 +- .../VisualBasic/Test/Emit/PDB/PDBTests.vb | 575 +----------------- .../Test/Emit/PDB/PDBUsingTests.vb | 11 +- .../Emit/PDB/PDBVariableInitializerTests.vb | 1 - src/Test/PdbUtilities/Pdb/PdbToXml.cs | 134 +--- 33 files changed, 66 insertions(+), 1633 deletions(-) diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncEHTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncEHTests.cs index 63077c6c665..ae6c283a38a 100644 --- 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() - diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncLocalsTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncLocalsTests.cs index 04fcb0116d1..530ded8fbad 100644 --- 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) - diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueStateMachineTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueStateMachineTests.cs index 3e955a5ec45..81d5f0007f1 100644 --- 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() - @@ -1100,7 +1099,6 @@ .maxstack 3 - diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs index 689dfd588d7..cefbabcd7bc 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs @@ -1,4 +1,4 @@ -// 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 - - - @@ -3184,11 +3181,6 @@ .maxstack 1 - - - - - @@ -3242,10 +3234,6 @@ .maxstack 1 - - - - @@ -3300,10 +3288,6 @@ .maxstack 1 - - - - @@ -3388,10 +3372,6 @@ .maxstack 1 - - - - diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.cs index 72b91d2d580..fb88a478ab4 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/LocalSlotMappingTests.cs @@ -1,4 +1,4 @@ -// 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