PR feedback

dotnet · Oct 9, 2020 · 2d5dc68 · 2d5dc68
1 parent 9d04790
commit 2d5dc68
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/DllImportGenerator/DllImportGenerator/DllImportStub.cs b/DllImportGenerator/DllImportGenerator/DllImportStub.cs
@@ -49,8 +49,6 @@ public IEnumerable<ParameterSyntax> StubParameters
 
         public MethodDeclarationSyntax DllImportDeclaration { get; private set; }
 
-        public IEnumerable<Diagnostic> Diagnostics { get; private set; }
-
         /// <summary>
         /// Flags used to indicate members on GeneratedDllImport attribute.
         /// </summary>

diff --git a/DllImportGenerator/DllImportGenerator/Marshalling/MarshallingGenerator.cs b/DllImportGenerator/DllImportGenerator/Marshalling/MarshallingGenerator.cs
@@ -53,6 +53,9 @@ internal interface IMarshallingGenerator
         /// <param name="info">Object to marshal</param>
         /// <param name="context">Code generation context</param>
         /// <returns>If the marshaller uses an identifier for the native value, true; otherwise, false.</returns>
+        /// <remarks>
+        /// <see cref="StubCodeContext.CurrentStage" /> of <paramref name="context"/> may not be valid.
+        /// </remarks>
         bool UsesNativeIdentifier(TypePositionInfo info, StubCodeContext context);
     }
 

diff --git a/DllImportGenerator/DllImportGenerator/StubCodeContext.cs b/DllImportGenerator/DllImportGenerator/StubCodeContext.cs
@@ -9,6 +9,11 @@ internal abstract class StubCodeContext
         /// </summary>
         public enum Stage
         {
+            /// <summary>
+            /// Invalid stage
+            /// </summary>
+            Invalid,
+
             /// <summary>
             /// Perform any setup required
             /// </summary>
@@ -55,7 +60,7 @@ public enum Stage
             GuaranteedUnmarshal
         }
 
-        public Stage CurrentStage { get; protected set; }
+        public Stage CurrentStage { get; protected set; } = Stage.Invalid;
 
         public abstract bool PinningSupported { get; }
 

diff --git a/DllImportGenerator/DllImportGenerator/StubCodeGenerator.cs b/DllImportGenerator/DllImportGenerator/StubCodeGenerator.cs
@@ -55,7 +55,6 @@ public StubCodeGenerator(
         {
             Debug.Assert(retTypeInfo.IsNativeReturnPosition);
 
-            this.CurrentStage = Stages[0];
             this.stubMethod = stubMethod;
             this.diagnostics = generatorDiagnostics;
 
@@ -81,19 +80,6 @@ public StubCodeGenerator(
             this.retMarshaller = (retTypeInfo, retGenerator);
         }
 
-        /// <summary>
-        /// Generate an identifier for the native return value and update the context with the new value
-        /// </summary>
-        /// <returns>Identifier for the native return value</returns>
-        public void GenerateReturnNativeIdentifier()
-        {
-            if (CurrentStage != Stage.Setup)
-                throw new InvalidOperationException();
-
-            // Update the native identifier for the return value
-            ReturnNativeIdentifier = $"{ReturnIdentifier}{GeneratedNativeIdentifierSuffix}";
-        }
-
         public override (string managed, string native) GetIdentifiers(TypePositionInfo info)
         {
             if (info.IsManagedReturnPosition && !info.IsNativeReturnPosition)
@@ -119,13 +105,13 @@ public override (string managed, string native) GetIdentifiers(TypePositionInfo
 
         public (BlockSyntax Code, MethodDeclarationSyntax DllImport) GenerateSyntax()
         {
-            this.CurrentStage = Stages[0];
             string dllImportName = stubMethod.Name + "__PInvoke__";
             var statements = new List<StatementSyntax>();
 
             if (retMarshaller.Generator.UsesNativeIdentifier(retMarshaller.TypeInfo, this))
             {
-                this.GenerateReturnNativeIdentifier();
+                // Update the native identifier for the return value
+                ReturnNativeIdentifier = $"{ReturnIdentifier}{GeneratedNativeIdentifierSuffix}";
             }
 
             foreach (var marshaller in paramMarshallers)