Consider interface method accessibility when generating the invoker (#…

…9019)
dotnet · May 22, 2024 · 71ea69e · 71ea69e
1 parent 63236c3
commit 71ea69e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Orleans.CodeGenerator/InvokableGenerator.cs b/src/Orleans.CodeGenerator/InvokableGenerator.cs
@@ -92,8 +92,8 @@ public GeneratedInvokableDescription Generate(InvokableMethodDescription invokab
 
             static Accessibility GetAccessibility(IMethodSymbol methodSymbol)
             {
+                Accessibility accessibility = methodSymbol.DeclaredAccessibility;
                 var t = methodSymbol.ContainingType;
-                Accessibility accessibility = t.DeclaredAccessibility;
                 while (t is not null)
                 {
                     if ((int)t.DeclaredAccessibility < (int)accessibility)

diff --git a/test/DefaultCluster.Tests/CodeGenTests/IRuntimeCodeGenGrain.cs b/test/DefaultCluster.Tests/CodeGenTests/IRuntimeCodeGenGrain.cs
@@ -33,6 +33,21 @@ public Task M(string arg)
 
     // End regression test for https://github.com/dotnet/orleans/issues/8991
 
+    public interface IGrainWithNonPublicMethods : IGrainWithGuidKey
+    {
+        internal class P1;
+        internal Task M1(P1 arg);
+
+        //protected class P2;
+        //protected Task M2(P2 arg);
+
+        internal protected class P3;
+        internal protected Task M3(P3 arg);
+
+        //private protected class P4;
+        //private protected Task M4(P4 arg);
+    }
+
     public interface IGrainWithGenericMethods : IGrainWithGuidKey
     {
         Task<Type[]> GetTypesExplicit<T, U, V>();