Check for EnC in profiler rejit (#98546)

dotnet · Jul 26, 2024 · 83cec4d · 83cec4d
1 parent 434470b
commit 83cec4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/coreclr/pal/prebuilt/inc/corerror.h b/src/coreclr/pal/prebuilt/inc/corerror.h
@@ -214,6 +214,7 @@
 #define CORDIAGIPC_E_UNKNOWN_ERROR EMAKEHR(0x1387)
 #define CORPROF_E_SUSPENSION_IN_PROGRESS EMAKEHR(0x1388)
 #define CORPROF_E_NOT_GC_OBJECT EMAKEHR(0x1389)
+#define CORPROF_E_MODULE_IS_ENC EMAKEHR(0x138A)
 #define CORSEC_E_POLICY_EXCEPTION EMAKEHR(0x1416)
 #define CORSEC_E_MIN_GRANT_FAIL EMAKEHR(0x1417)
 #define CORSEC_E_NO_EXEC_PERM EMAKEHR(0x1418)

diff --git a/src/coreclr/vm/rejit.cpp b/src/coreclr/vm/rejit.cpp
@@ -508,6 +508,12 @@ HRESULT ReJitManager::UpdateActiveILVersions(
             continue;
         }
 
+        if (pModule->IsEditAndContinueEnabled())
+        {
+            ReportReJITError(pModule, rgMethodDefs[i], NULL, CORPROF_E_MODULE_IS_ENC);
+            continue;
+        }
+
         if (!pModule->GetMDImport()->IsValidToken(rgMethodDefs[i]))
         {
             ReportReJITError(pModule, rgMethodDefs[i], NULL, E_INVALIDARG);