Modified: trunk/Source/_javascript_Core/ChangeLog (265153 => 265154)
--- trunk/Source/_javascript_Core/ChangeLog 2020-07-31 18:57:08 UTC (rev 265153)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-07-31 19:24:08 UTC (rev 265154)
@@ -1,5 +1,16 @@
2020-07-31 Saam Barati <[email protected]>
+ Re-enable NO_SMT on Catalina
+ https://bugs.webkit.org/show_bug.cgi?id=215024
+
+ Reviewed by Alexey Proskuryakov.
+
+ * runtime/Options.cpp:
+ (JSC::defaultTCSMValue):
+ * runtime/OptionsList.h:
+
+2020-07-31 Saam Barati <[email protected]>
+
validate untagArrayPtr
https://bugs.webkit.org/show_bug.cgi?id=214953
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (265153 => 265154)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2020-07-31 18:57:08 UTC (rev 265153)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2020-07-31 19:24:08 UTC (rev 265154)
@@ -230,6 +230,15 @@
return computeNumberOfWorkerThreads(maxNumberOfGCMarkers);
}
+static bool defaultTCSMValue()
+{
+#if CPU(X86_64) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 110000) || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED < 140000))
+ return true;
+#else
+ return false;
+#endif
+}
+
const char* const OptionRange::s_nullRangeStr = "<null>";
bool OptionRange::init(const char* rangeString)
Modified: trunk/Source/_javascript_Core/runtime/OptionsList.h (265153 => 265154)
--- trunk/Source/_javascript_Core/runtime/OptionsList.h 2020-07-31 18:57:08 UTC (rev 265153)
+++ trunk/Source/_javascript_Core/runtime/OptionsList.h 2020-07-31 19:24:08 UTC (rev 265154)
@@ -76,7 +76,7 @@
// and cannot be modified thereafter.
#define FOR_EACH_JSC_OPTION(v) \
- v(Bool, useKernTCSM, false, Normal, "Note: this needs to go before other options since they depend on this value.") \
+ v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \
v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
v(Unsigned, dumpOptions, 0, Normal, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
v(OptionString, configFile, nullptr, Normal, "file to configure JSC options and logging location") \