From 5b7e3657731afafe9b07cd4b294983f73df705cc Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Wed, 29 Apr 2015 16:04:13 -0700
Subject: [PATCH] Reset error message on each retry

The expression compiler was returning a non-null error string in cases
where it succeeded on retry.
---
 .../MissingAssemblyTests.cs                   | 67 ++++++++++++++++++-
 .../ExpressionCompiler/ExpressionCompiler.cs  |  3 +-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/MissingAssemblyTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/MissingAssemblyTests.cs
index 8528f4f9db3..3fccae1f21b 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/MissingAssemblyTests.cs
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/MissingAssemblyTests.cs
@@ -13,6 +13,7 @@
 using System.Runtime.InteropServices;
 using Xunit;
 using Roslyn.Test.PdbUtilities;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
 
 namespace Microsoft.CodeAnalysis.CSharp.UnitTests
 {
@@ -609,8 +610,70 @@ void M()
                 out errorMessage); 
  
             Assert.Equal(2, numRetries); // Ensure that we actually retried and that we bailed out on the second retry if the same identity was seen in the diagnostics.
-            Assert.Equal($"error CS0012: The type 'MissingType' is defined in an assembly that is not referenced. You must add a reference to assembly '{missingIdentity}'.", errorMessage); 
-        } 
+            Assert.Equal($"error CS0012: The type 'MissingType' is defined in an assembly that is not referenced. You must add a reference to assembly '{missingIdentity}'.", errorMessage);
+        }
+
+        [WorkItem(1151888)]
+        [Fact]
+        public void SucceedOnRetry()
+        {
+            var source = @" 
+class C 
+{ 
+    void M() 
+    { 
+    } 
+}";
+            var comp = CreateCompilationWithMscorlib(source);
+            var runtime = CreateRuntimeInstance(comp);
+            var context = CreateMethodContext(runtime, "C.M");
+
+            var missingModule = runtime.Modules.First();
+            var missingIdentity = missingModule.MetadataReader.ReadAssemblyIdentityOrThrow();
+
+            var shouldSucceed = false;
+            string errorMessage;
+            var compileResult = ExpressionCompilerTestHelpers.CompileExpressionWithRetry(
+                runtime.Modules.Select(m => m.MetadataBlock).ToImmutableArray(),
+                context,
+                (_, diagnostics) =>
+                {
+                    if (shouldSucceed)
+                    {
+                        return TestCompileResult.Instance;
+                    }
+                    else
+                    {
+                        shouldSucceed = true;
+                        diagnostics.Add(new CSDiagnostic(new CSDiagnosticInfo(ErrorCode.ERR_NoTypeDef, "MissingType", missingIdentity), Location.None));
+                        return null;
+                    }
+                },
+                (AssemblyIdentity assemblyIdentity, out uint uSize) =>
+                {
+                    uSize = (uint)missingModule.MetadataLength;
+                    return missingModule.MetadataAddress;
+                },
+                out errorMessage);
+
+            Assert.Same(TestCompileResult.Instance, compileResult);
+            Assert.Null(errorMessage);
+        }
+
+        private sealed class TestCompileResult : CompileResult
+        {
+            public static readonly CompileResult Instance = new TestCompileResult();
+
+            private TestCompileResult()
+                : base(null, null, null, null)
+            {
+            }
+
+            public override CustomTypeInfo GetCustomTypeInfo()
+            {
+                throw new NotImplementedException();
+            }
+        }
 
         private EvaluationContext CreateMethodContextWithReferences(Compilation comp, string methodName, params MetadataReference[] references)
         {
diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs
index 96bc15d2b72..dede9cdca51 100644
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.cs
@@ -292,13 +292,14 @@ private EvaluationContextBase CreateMethodContext(DkmClrInstructionAddress instr
             DkmUtilities.GetMetadataBytesPtrFunction getMetaDataBytesPtr,
             out string errorMessage)
         {
-            errorMessage = null;
             TResult compileResult;
 
             PooledHashSet<AssemblyIdentity> assembliesLoadedInRetryLoop = null;
             bool tryAgain;
             do
             {
+                errorMessage = null;
+
                 var context = createContext(metadataBlocks, useReferencedModulesOnly: false);
                 var diagnostics = DiagnosticBag.GetInstance();
                 compileResult = compile(context, diagnostics);
-- 
GitLab