Merge conflict and fix Verification.PassesOrFailFast

dotnet · Oct 6, 2022 · e0f2dd2 · e0f2dd2
1 parent 40be908
commit e0f2dd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/Compilers/CSharp/Test/Emit2/Emit/NumericIntPtrTests.cs b/src/Compilers/CSharp/Test/Emit2/Emit/NumericIntPtrTests.cs
@@ -9004,14 +9004,8 @@ static void Main()
                 var refA = comp.EmitToImageReference();
                 comp = CreateCompilation(sourceB, references: new[] { refA }, options: TestOptions.ReleaseExe, parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.Net70);
 
-<<<<<<< HEAD
-                CompileAndVerify(comp, verify: Verification.FailsPEVerify, expectedOutput: IncludeExpectedOutput(expectedResult));
-||||||| c47866ea2d9
-                CompileAndVerify(comp, expectedOutput: expectedResult);
-=======
                 // Investigating flaky IL verification issue. Tracked by https://github.com/dotnet/roslyn/issues/63782
-                CompileAndVerify(comp, expectedOutput: expectedResult, verify: Verification.PassesOrFailFast);
->>>>>>> dotnet/main
+                CompileAndVerify(comp, verify: Verification.PassesOrFailFast | Verification.FailsPEVerify, expectedOutput: IncludeExpectedOutput(expectedResult));
                 Assert.NotNull(expectedResult);
             }
 

diff --git a/src/Compilers/Test/Core/CompilationVerifier.cs b/src/Compilers/Test/Core/CompilationVerifier.cs
@@ -234,7 +234,7 @@ public void Emit(
                 ILVerify(peVerify);
 #endif
             }
-            catch (Exception) when (peVerify is Verification.PassesOrFailFast)
+            catch (Exception) when ((peVerify & Verification.PassesOrFailFast) != 0)
             {
                 var il = DumpIL();
                 Console.WriteLine(il);