change recent FailFasts to use ReportFatalException

MikeHolman · MikeHolman · commit ac67ca210d2e · 2016-05-06T17:35:23.000-07:00
diff --git a/lib/Common/Exceptions/ReportError.cpp b/lib/Common/Exceptions/ReportError.cpp
@@ -106,4 +106,16 @@ __declspec(noinline) void FromDOM_NoScriptScope_fatal_error()
     ReportFatalException(NULL, E_UNEXPECTED, EnterScript_FromDOM_NoScriptScope, scenario);
 }
 
+__declspec(noinline) void EntryExitRecord_Corrupted_fatal_error()
+{
+    int scenario = 6;
+    ReportFatalException(NULL, E_UNEXPECTED, Fatal_EntryExitRecordCorruption, scenario);
+}
+
+__declspec(noinline) void UnexpectedExceptionHandling_fatal_error(EXCEPTION_POINTERS * originalException)
+{
+    int scenario = 7;
+    ReportFatalException(NULL, E_UNEXPECTED, Fatal_UnexpectedExceptionHandling, scenario);
+}
+
 #pragma optimize("",on)
diff --git a/lib/Common/Exceptions/ReportError.h b/lib/Common/Exceptions/ReportError.h
@@ -19,7 +19,9 @@ enum ErrorReason
     MarkStack_OUTOFMEMORY = 11,
     EnterScript_FromDOM_NoScriptScope = 12,
     Fatal_FailedToBox_OUTOFMEMORY = 13,
-    Fatal_Recycler_MemoryCorruption = 14
+    Fatal_Recycler_MemoryCorruption = 14,
+    Fatal_EntryExitRecordCorruption = 15,
+    Fatal_UnexpectedExceptionHandling = 16
 };
 
 extern "C" void ReportFatalException(
@@ -52,6 +54,8 @@ void MarkStack_OOM_fatal_error();
 
 void Binary_Inconsistency_fatal_error();
 void Version_Inconsistency_fatal_error();
+void EntryExitRecord_Corrupted_fatal_error();
+void UnexpectedExceptionHandling_fatal_error(EXCEPTION_POINTERS * originalException);
 
 #ifdef LARGEHEAPBLOCK_ENCODING
 void LargeHeapBlock_Metadata_Corrupted(
diff --git a/lib/Runtime/Base/ThreadContext.cpp b/lib/Runtime/Base/ThreadContext.cpp
@@ -1874,9 +1874,9 @@ ThreadContext::PushEntryExitRecord(Js::ScriptEntryExitRecord * record)
         record->next = lastRecord;
 
         // these are on stack, which grows down. if this condition doesn't hold, then the list somehow got messed up
-        if ((uintptr_t)record > (uintptr_t)lastRecord)
+        if (!IsOnStack(lastRecord) || (uintptr_t)record >= (uintptr_t)lastRecord)
         {
-            RaiseFailFastException(nullptr, nullptr, 0);
+            EntryExitRecord_Corrupted_fatal_error();
         }
     }
 
@@ -1888,12 +1888,13 @@ void ThreadContext::PopEntryExitRecord(Js::ScriptEntryExitRecord * record)
     AssertMsg(record && record == this->entryExitRecord, "Mismatch script entry/exit");
 
     // these are on stack, which grows down. if this condition doesn't hold, then the list somehow got messed up
-    if (this->entryExitRecord->next && (uintptr_t)this->entryExitRecord > (uintptr_t)this->entryExitRecord->next)
+    Js::ScriptEntryExitRecord * next = this->entryExitRecord->next;
+    if (next && (!IsOnStack(next) || (uintptr_t)this->entryExitRecord >= (uintptr_t)next))
     {
-        RaiseFailFastException(nullptr, nullptr, 0);
+        EntryExitRecord_Corrupted_fatal_error();
     }
 
-    this->entryExitRecord = this->entryExitRecord->next;
+    this->entryExitRecord = next;
 }
 
 BOOL ThreadContext::ReserveStaticTypeIds(__in int first, __in int last)
diff --git a/lib/Runtime/Library/JavascriptFunction.cpp b/lib/Runtime/Library/JavascriptFunction.cpp
@@ -642,10 +642,8 @@ namespace Js
             // 0xE06D7363 is C++ exception code
             if (exceptionCode != 0 && !IsDebuggerPresent() && exceptionCode != 0xE06D7363 && exceptionAction != EXCEPTION_CONTINUE_EXECUTION)
             {
-                exceptionInfo;
-
                 // ensure that hosts are not doing SEH across Chakra frames, as that can lead to bad state (e.g. destructors not being called)
-                RaiseFailFastException(nullptr, nullptr, 0);
+                UnexpectedExceptionHandling_fatal_error(&exceptionInfo);
             }
         }
         //ret should never be null here

Original file line number	Diff line number	Diff line change
`@@ -1874,9 +1874,9 @@ ThreadContext::PushEntryExitRecord(Js::ScriptEntryExitRecord * record)`
`1874`	`1874`	`record->next = lastRecord;`
`1875`	`1875`
`1876`	`1876`	`// these are on stack, which grows down. if this condition doesn't hold, then the list somehow got messed up`
`1877`		`- if ((uintptr_t)record > (uintptr_t)lastRecord)`
	`1877`	`+ if (!IsOnStack(lastRecord) \|\| (uintptr_t)record >= (uintptr_t)lastRecord)`
`1878`	`1878`	`{`
`1879`		`- RaiseFailFastException(nullptr, nullptr, 0);`
	`1879`	`+ EntryExitRecord_Corrupted_fatal_error();`
`1880`	`1880`	`}`
`1881`	`1881`	`}`
`1882`	`1882`
`@@ -1888,12 +1888,13 @@ void ThreadContext::PopEntryExitRecord(Js::ScriptEntryExitRecord * record)`
`1888`	`1888`	`AssertMsg(record && record == this->entryExitRecord, "Mismatch script entry/exit");`
`1889`	`1889`
`1890`	`1890`	`// these are on stack, which grows down. if this condition doesn't hold, then the list somehow got messed up`
`1891`		`- if (this->entryExitRecord->next && (uintptr_t)this->entryExitRecord > (uintptr_t)this->entryExitRecord->next)`
	`1891`	`+ Js::ScriptEntryExitRecord * next = this->entryExitRecord->next;`
	`1892`	`+ if (next && (!IsOnStack(next) \|\| (uintptr_t)this->entryExitRecord >= (uintptr_t)next))`
`1892`	`1893`	`{`
`1893`		`- RaiseFailFastException(nullptr, nullptr, 0);`
	`1894`	`+ EntryExitRecord_Corrupted_fatal_error();`
`1894`	`1895`	`}`
`1895`	`1896`
`1896`		`- this->entryExitRecord = this->entryExitRecord->next;`
	`1897`	`+ this->entryExitRecord = next;`
`1897`	`1898`	`}`
`1898`	`1899`
`1899`	`1900`	`BOOL ThreadContext::ReserveStaticTypeIds(__in int first, __in int last)`
Original file line number	Diff line number	Diff line change
`@@ -642,10 +642,8 @@ namespace Js`
`642`	`642`	`// 0xE06D7363 is C++ exception code`
`643`	`643`	`if (exceptionCode != 0 && !IsDebuggerPresent() && exceptionCode != 0xE06D7363 && exceptionAction != EXCEPTION_CONTINUE_EXECUTION)`
`644`	`644`	`{`
`645`		`- exceptionInfo;`
`646`		`-`
`647`	`645`	`// ensure that hosts are not doing SEH across Chakra frames, as that can lead to bad state (e.g. destructors not being called)`
`648`		`- RaiseFailFastException(nullptr, nullptr, 0);`
	`646`	`+ UnexpectedExceptionHandling_fatal_error(&exceptionInfo);`
`649`	`647`	`}`
`650`	`648`	`}`
`651`	`649`	`//ret should never be null here`