Handle struct marshal stubs in ILStubManager::TraceManager. (#36249)

jkoritzinsky · web-flow · commit 0cb7b8236abe · 2020-05-11T22:18:17.000-07:00
Fixes #36248
diff --git a/src/coreclr/src/vm/stubmgr.cpp b/src/coreclr/src/vm/stubmgr.cpp
@@ -1844,6 +1844,12 @@ BOOL ILStubManager::TraceManager(Thread *thread,
         trace->InitForUnmanaged(target);
     }
 #endif // FEATURE_COMINTEROP
+    else if (pStubMD->IsStructMarshalStub())
+    {
+        // There's no "target" for struct marshalling stubs
+        // so we have nowhere to tell the debugger to move the breakpoint.
+        return FALSE;
+    }
     else
     {
         // This is either direct forward P/Invoke or a CLR-to-COM call, the argument is MD

Original file line number	Diff line number	Diff line change
`@@ -1844,6 +1844,12 @@ BOOL ILStubManager::TraceManager(Thread *thread,`
`1844`	`1844`	`trace->InitForUnmanaged(target);`
`1845`	`1845`	`}`
`1846`	`1846`	`#endif // FEATURE_COMINTEROP`
	`1847`	`+ else if (pStubMD->IsStructMarshalStub())`
	`1848`	`+ {`
	`1849`	`+ // There's no "target" for struct marshalling stubs`
	`1850`	`+ // so we have nowhere to tell the debugger to move the breakpoint.`
	`1851`	`+ return FALSE;`
	`1852`	`+ }`
`1847`	`1853`	`else`
`1848`	`1854`	`{`
`1849`	`1855`	`// This is either direct forward P/Invoke or a CLR-to-COM call, the argument is MD`