Merge pull request #1013 from dotnet-bot/from-tfs

Merge changes from TFS

3 files changed, 14 insertions, 2 deletions

diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp
index a0343e4267..2e8d5aa4b7 100644
--- a/src/vm/corhost.cpp
+++ b/src/vm/corhost.cpp
@@ -1945,7 +1945,7 @@ HRESULT CorHost2::SetStartupFlags(STARTUP_FLAGS flag)
     }
     CONTRACTL_END;
 
-    if (m_fStarted)
+    if (g_fEEStarted)
     {
         return HOST_E_INVALIDOPERATION;
     }
diff --git a/src/vm/pefile.inl b/src/vm/pefile.inl
index 07d42d5859..e3017131e3 100644
--- a/src/vm/pefile.inl
+++ b/src/vm/pefile.inl
@@ -774,7 +774,14 @@ inline BOOL PEFile::IsIbcOptimized()
 
 inline BOOL PEFile::IsILImageReadyToRun()
 {
-    WRAPPER_NO_CONTRACT;
+    CONTRACTL
+    {
+        INSTANCE_CHECK;
+        MODE_ANY;
+        NOTHROW;
+        GC_NOTRIGGER;
+    }
+    CONTRACTL_END;
 
 #ifdef FEATURE_PREJIT
     if (IsNativeLoaded())
diff --git a/src/vm/virtualcallstub.h b/src/vm/virtualcallstub.h
index f5bf0d9506..02605f237d 100644
--- a/src/vm/virtualcallstub.h
+++ b/src/vm/virtualcallstub.h
@@ -325,6 +325,11 @@ public:
         WRAPPER_NO_CONTRACT;
         SUPPORTS_DAC;
 
+        // This method can called with stubStartAddress==NULL, e.g. when handling null reference exceptions
+        // caused by IP=0. Early out for this case to avoid confusing handled access violations inside predictStubKind.
+        if (PCODEToPINSTR(stubStartAddress) == NULL)
+            return SK_UNKNOWN;
+
         // Rather than calling IsInRange(stubStartAddress) for each possible stub kind
         // we can peek at the assembly code and predict which kind of a stub we have
         StubKind predictedKind = predictStubKind(stubStartAddress);