From 81dc580bdf1d56e8a8728454908869fba2b0e718 Mon Sep 17 00:00:00 2001
From: Julien Couvreur <julien.couvreur@gmail.com>
Date: Sun, 26 Dec 2021 10:32:36 -0800
Subject: [PATCH] Remove instrumentation

---
 .../Test/Emit/CodeGen/CodeGenTupleTest.cs     | 52 ++++++++-----------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs
index 819597a41436..88f4c167703a 100644
--- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs
+++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs
@@ -28563,41 +28563,33 @@ static void verify(FieldSymbol field)
         [Fact]
         public void TupleWithElementNamedWithDefaultName()
         {
-            // Instrumenting test as part of investigating flakiness: https://github.com/dotnet/roslyn/issues/52658
-            for (int i = 0; i < 1000; i++)
-            {
-                string source = @"
+            string source = @"
 class C
 {
     (int Item1, int Item2) M() => throw null;
 }
 ";
-                var comp = CreateCompilation(source);
-                var m = (MethodSymbol)comp.GetMember("C.M");
-                var tuple = m.ReturnType;
-                Assert.Equal("(System.Int32 Item1, System.Int32 Item2)", tuple.ToTestDisplayString());
-                Assert.IsType<ConstructedNamedTypeSymbol>(tuple);
-
-                var item1 = tuple.GetMember<TupleElementFieldSymbol>("Item1");
-                // Instrumenting test as part of investigating flakiness: https://github.com/dotnet/roslyn/issues/52658
-                RoslynDebug.AssertOrFailFast(0 == item1.TupleElementIndex);
-
-                var item1Underlying = item1.TupleUnderlyingField;
-                Assert.IsType<SubstitutedFieldSymbol>(item1Underlying);
-                Assert.Equal("System.Int32 (System.Int32 Item1, System.Int32 Item2).Item1", item1Underlying.ToTestDisplayString());
-                // Instrumenting test as part of investigating flakiness: https://github.com/dotnet/roslyn/issues/52658
-                RoslynDebug.AssertOrFailFast(0 == item1Underlying.TupleElementIndex);
-                Assert.Same(item1Underlying, item1Underlying.TupleUnderlyingField);
-
-                var item2 = tuple.GetMember<TupleElementFieldSymbol>("Item2");
-                // Instrumenting test as part of investigating flakiness: https://github.com/dotnet/roslyn/issues/52658
-                RoslynDebug.AssertOrFailFast(1 == item2.TupleElementIndex);
-                var item2Underlying = item2.TupleUnderlyingField;
-                Assert.IsType<SubstitutedFieldSymbol>(item2Underlying);
-                // Instrumenting test as part of investigating flakiness: https://github.com/dotnet/roslyn/issues/52658
-                RoslynDebug.AssertOrFailFast(1 == item2Underlying.TupleElementIndex);
-                Assert.Same(item2Underlying, item2Underlying.TupleUnderlyingField);
-            }
+            var comp = CreateCompilation(source);
+            var m = (MethodSymbol)comp.GetMember("C.M");
+            var tuple = m.ReturnType;
+            Assert.Equal("(System.Int32 Item1, System.Int32 Item2)", tuple.ToTestDisplayString());
+            Assert.IsType<ConstructedNamedTypeSymbol>(tuple);
+
+            var item1 = tuple.GetMember<TupleElementFieldSymbol>("Item1");
+            Assert.Equal(0, item1.TupleElementIndex);
+
+            var item1Underlying = item1.TupleUnderlyingField;
+            Assert.IsType<SubstitutedFieldSymbol>(item1Underlying);
+            Assert.Equal("System.Int32 (System.Int32 Item1, System.Int32 Item2).Item1", item1Underlying.ToTestDisplayString());
+            Assert.Equal(0, item1Underlying.TupleElementIndex);
+            Assert.Same(item1Underlying, item1Underlying.TupleUnderlyingField);
+
+            var item2 = tuple.GetMember<TupleElementFieldSymbol>("Item2");
+            Assert.Equal(1, item2.TupleElementIndex);
+            var item2Underlying = item2.TupleUnderlyingField;
+            Assert.IsType<SubstitutedFieldSymbol>(item2Underlying);
+            Assert.Equal(1, item2Underlying.TupleElementIndex);
+            Assert.Same(item2Underlying, item2Underlying.TupleUnderlyingField);
         }
 
         [Fact]