don't use r2r images when the profiler requests that ngen images are disabled (#13349)

davmason · jkotas · commit 94d4aa4981f1 · 2017-08-16T21:27:53.000-07:00
diff --git a/src/vm/readytoruninfo.cpp b/src/vm/readytoruninfo.cpp
@@ -483,6 +483,12 @@ PTR_ReadyToRunInfo ReadyToRunInfo::Initialize(Module * pModule, AllocMemTracker
         return NULL;
     }
 
+    if (CORProfilerDisableAllNGenImages() || CORProfilerUseProfileImages())
+    {
+        DoLog("Ready to Run disabled - profiler disabled native images");
+        return NULL;
+    }
+
     if (g_pConfig->ExcludeReadyToRun(pModule->GetSimpleName()))
     {
         DoLog("Ready to Run disabled - module on exclusion list");

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,12 @@ PTR_ReadyToRunInfo ReadyToRunInfo::Initialize(Module * pModule, AllocMemTracker`
`483`	`483`	`return NULL;`
`484`	`484`	`}`
`485`	`485`
	`486`	`+ if (CORProfilerDisableAllNGenImages() \|\| CORProfilerUseProfileImages())`
	`487`	`+ {`
	`488`	`+ DoLog("Ready to Run disabled - profiler disabled native images");`
	`489`	`+ return NULL;`
	`490`	`+ }`
	`491`	`+`
`486`	`492`	`if (g_pConfig->ExcludeReadyToRun(pModule->GetSimpleName()))`
`487`	`493`	`{`
`488`	`494`	`DoLog("Ready to Run disabled - module on exclusion list");`