Do not support reverse direction for marshalling of VARIANT

dotnet · May 27, 2021 · db09743 · db09743
1 parent a729924
commit db09743
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.Aot.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.Aot.cs
@@ -1079,6 +1079,11 @@ protected override void AllocManagedToNative(ILCodeStream codeStream)
 
         protected override void TransformManagedToNative(ILCodeStream codeStream)
         {
+            if (this.MarshalDirection == MarshalDirection.Reverse)
+            {
+                throw new NotSupportedException();
+            }
+
             ILEmitter emitter = _ilCodeStreams.Emitter;
 
             LoadManagedValue(codeStream);
@@ -1090,6 +1095,11 @@ protected override void TransformManagedToNative(ILCodeStream codeStream)
 
         protected override void TransformNativeToManaged(ILCodeStream codeStream)
         {
+            if (this.MarshalDirection == MarshalDirection.Reverse)
+            {
+                throw new NotSupportedException();
+            }
+
             ILEmitter emitter = _ilCodeStreams.Emitter;
 
             LoadNativeAddr(codeStream);

diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs
@@ -1438,6 +1438,9 @@ protected override void AllocAndTransformManagedToNative(ILCodeStream codeStream
                 codeStream.Emit(ILOpcode.brfalse, pLoadFalseLabel);
                 codeStream.EmitLdc(_trueValue);
                 codeStream.Emit(ILOpcode.br, pDoneLabel);
+#if DEBUG
+                codeStream.Emit(ILOpcode.pop);   // keep the simple stack level calculator happy
+#endif // DEBUG
 
                 codeStream.EmitLabel(pLoadFalseLabel);
                 codeStream.EmitLdc(0);