Changeset 220404 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Aug 8, 2017, 9:00:06 AM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r220368.

This change caused WK1 tests to exit early with crashes.

Reverted changeset:

"Baseline JIT should do caging"
​https://bugs.webkit.org/show_bug.cgi?id=175037
​http://trac.webkit.org/changeset/220368

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -3803 +3803 @@
 }
 
+static void primitiveGigacageDisabled(void*)
+{
+    dataLog("Primitive gigacage disabled! Aborting.\n");
+    UNREACHABLE_FOR_PLATFORM();
+}
+
 int jscmain(int argc, char** argv)
 {
@@ -3821 +3827 @@
     JSC::Wasm::enableFastMemory();
 #endif
-    Gigacage::disableDisablingPrimitiveGigacageIfShouldBeEnabled();
+    if (Gigacage::shouldBeEnabled())
+        Gigacage::addPrimitiveDisableCallback(primitiveGigacageDisabled, nullptr);
 
     int result;