Merge pull request #40281 from dotnet/merges/release/dev16.4-to-relea…

…se/dev16.4-vs-deps Merge release/dev16.4 to release/dev16.4-vs-deps
dotnet · Dec 10, 2019 · c4e5d13 · c4e5d13
2 parents 52d275c + 97ff81a
commit c4e5d13
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs
@@ -3607,7 +3607,7 @@ private ImmutableArray<VisitArgumentResult> VisitArguments(
                 }
             }
 
-            if (method is object && (method.FlowAnalysisAnnotations & FlowAnalysisAnnotations.DoesNotReturn) == FlowAnalysisAnnotations.DoesNotReturn)
+            if (!IsAnalyzingAttribute && method is object && (method.FlowAnalysisAnnotations & FlowAnalysisAnnotations.DoesNotReturn) == FlowAnalysisAnnotations.DoesNotReturn)
             {
                 SetUnreachable();
             }

diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs
@@ -7235,6 +7235,31 @@ class C { }
                 );
         }
 
+        [Fact, WorkItem(40136, "https://github.com/dotnet/roslyn/issues/40136")]
+        public void SelfReferencingAttribute()
+        {
+            var source = @"
+using System;
+
+[AttributeUsage(AttributeTargets.All)]
+[ExplicitCrossPackageInternal(ExplicitCrossPackageInternalAttribute.s)]
+internal sealed class ExplicitCrossPackageInternalAttribute : Attribute
+{
+    internal const string s = """";
+
+    [ExplicitCrossPackageInternal(s)]
+    internal ExplicitCrossPackageInternalAttribute([ExplicitCrossPackageInternal(s)] string prop)
+    {
+    }
+
+    [return: ExplicitCrossPackageInternal(s)]
+    [ExplicitCrossPackageInternal(s)]
+    internal void Method() { }
+}";
+            var comp = CreateNullableCompilation(source);
+            comp.VerifyDiagnostics();
+        }
+
         [Fact]
         public void NullableAndConditionalOperators()
         {