don't use r2r images when the profiler requests that ngen images are disabled

diff --git a/src/vm/readytoruninfo.cpp b/src/vm/readytoruninfo.cpp
index b85cf9a9c319603511eafe948a0fd503c9cf2710..56cfb60c5429d18077e3a4f9891d237ebe846452 100644 (file)
--- a/src/vm/readytoruninfo.cpp
+++ b/src/vm/readytoruninfo.cpp
@@ -348,7 +348,9 @@ BOOL ReadyToRunInfo::IsReadyToRunEnabled()
     WRAPPER_NO_CONTRACT;
 
     static ConfigDWORD configReadyToRun;
-    return configReadyToRun.val(CLRConfig::EXTERNAL_ReadyToRun);
+    return configReadyToRun.val(CLRConfig::EXTERNAL_ReadyToRun) && 
+            !(CORProfilerDisableAllNGenImages()) && 
+            !(CORProfilerUseProfileImages());
 }
 
 // A log file to record success/failure of R2R loads. s_r2rLogFile can have the following values: