Diff
Modified: branches/safari-611-branch/PerformanceTests/APIBench/api-bench (272674 => 272675)
--- branches/safari-611-branch/PerformanceTests/APIBench/api-bench 2021-02-10 20:25:42 UTC (rev 272674)
+++ branches/safari-611-branch/PerformanceTests/APIBench/api-bench 2021-02-10 20:25:46 UTC (rev 272675)
@@ -37,7 +37,6 @@
CURRENT_API=()
UPCOMING_API=()
ARCHS=${ARCHS:-$(uname -m)}
-CONFIGURATION=${CONFIGURATION:-Release}
shouldBuild=true
runReferences=true
@@ -149,7 +148,7 @@
fi
log "Building $BENCHMARK_NAME... (FRAMEWORK_SEARCH_PATHS='$BUILD_DIRECTORY')"
- xcodebuild -project "$project" -target "$BENCHMARK_NAME" -configuration "$CONFIGURATION" build "FRAMEWORK_SEARCH_PATHS='$BUILD_DIRECTORY'" "ARCHS='$ARCHS'"
+ xcodebuild -project "$project" -target "$BENCHMARK_NAME" -configuration Release build "FRAMEWORK_SEARCH_PATHS='$BUILD_DIRECTORY'" "ARCHS='$ARCHS'"
}
build() {
@@ -162,14 +161,9 @@
}
runNativeBenchmark() {
- pushd "build/$CONFIGURATION" &> /dev/null
+ pushd "build/Release" &> /dev/null
"./$BENCHMARK_NAME"
- local exitCode=$?
- if [ $exitCode -ne 0 ]; then
- echo "Benchmark exited with an error: $PWD/$BENCHMARK_NAME exited with $exitCode" 1>&2
- fi
popd &> /dev/null
- return $exitCode
}
runBenchmarkIteration() {
@@ -185,9 +179,6 @@
local result
result=$(runBenchmarkIteration)
- if [ $? -ne 0 ]; then
- exit 1
- fi
RESULTS[$((BENCHMARK_ID * iterations + ITERATION))]=$result
log "Finished in ${result}ms"
}
Modified: branches/safari-611-branch/PerformanceTests/ChangeLog (272674 => 272675)
--- branches/safari-611-branch/PerformanceTests/ChangeLog 2021-02-10 20:25:42 UTC (rev 272674)
+++ branches/safari-611-branch/PerformanceTests/ChangeLog 2021-02-10 20:25:46 UTC (rev 272675)
@@ -1,3 +1,7 @@
+2021-02-10 Alan Coon <alanc...@apple.com>
+
+ Revert r272538. rdar://problem/74183111
+
2021-02-08 Russell Epstein <repst...@apple.com>
Cherry-pick r270665. rdar://problem/74105427
Modified: branches/safari-611-branch/Source/_javascript_Core/API/APICast.h (272674 => 272675)
--- branches/safari-611-branch/Source/_javascript_Core/API/APICast.h 2021-02-10 20:25:42 UTC (rev 272674)
+++ branches/safari-611-branch/Source/_javascript_Core/API/APICast.h 2021-02-10 20:25:46 UTC (rev 272675)
@@ -88,13 +88,6 @@
return result;
}
-#if CPU(ADDRESS64)
-inline JSC::JSValue toJS(JSValueRef value)
-{
- return bitwise_cast<JSC::JSValue>(value);
-}
-#endif
-
inline JSC::JSValue toJSForGC(JSC::JSGlobalObject* globalObject, JSValueRef v)
{
ASSERT_UNUSED(globalObject, globalObject);
@@ -155,13 +148,6 @@
return toRef(getVM(globalObject), v);
}
-#if CPU(ADDRESS64)
-inline JSValueRef toRef(JSC::JSValue v)
-{
- return bitwise_cast<JSValueRef>(v);
-}
-#endif
-
inline JSObjectRef toRef(JSC::JSObject* o)
{
return reinterpret_cast<JSObjectRef>(o);
Modified: branches/safari-611-branch/Source/_javascript_Core/API/JSValue.mm (272674 => 272675)
--- branches/safari-611-branch/Source/_javascript_Core/API/JSValue.mm 2021-02-10 20:25:42 UTC (rev 272674)
+++ branches/safari-611-branch/Source/_javascript_Core/API/JSValue.mm 2021-02-10 20:25:46 UTC (rev 272675)
@@ -398,65 +398,37 @@
- (BOOL)isUndefined
{
-#if !CPU(ADDRESS64)
return JSValueIsUndefined([_context JSGlobalContextRef], m_value);
-#else
- return toJS(m_value).isUndefined();
-#endif
}
- (BOOL)isNull
{
-#if !CPU(ADDRESS64)
- return JSValueIsUndefined([_context JSGlobalContextRef], m_value);
-#else
- return toJS(m_value).isNull();
-#endif
+ return JSValueIsNull([_context JSGlobalContextRef], m_value);
}
- (BOOL)isBoolean
{
-#if !CPU(ADDRESS64)
- return JSValueIsUndefined([_context JSGlobalContextRef], m_value);
-#else
- return toJS(m_value).isBoolean();
-#endif
+ return JSValueIsBoolean([_context JSGlobalContextRef], m_value);
}
- (BOOL)isNumber
{
-#if !CPU(ADDRESS64)
- return JSValueIsUndefined([_context JSGlobalContextRef], m_value);
-#else
- return toJS(m_value).isNumber();
-#endif
+ return JSValueIsNumber([_context JSGlobalContextRef], m_value);
}
- (BOOL)isString
{
-#if !CPU(ADDRESS64)
- return JSValueIsUndefined([_context JSGlobalContextRef], m_value);
-#else
- return toJS(m_value).isString();
-#endif
+ return JSValueIsString([_context JSGlobalContextRef], m_value);
}
- (BOOL)isObject
{
-#if !CPU(ADDRESS64)
return JSValueIsObject([_context JSGlobalContextRef], m_value);
-#else
- return toJS(m_value).isObject();
-#endif
}
- (BOOL)isSymbol
{
-#if !CPU(ADDRESS64)
return JSValueIsSymbol([_context JSGlobalContextRef], m_value);
-#else
- return toJS(m_value).isSymbol();
-#endif
}
- (BOOL)isArray
Modified: branches/safari-611-branch/Source/_javascript_Core/API/JSValueRef.cpp (272674 => 272675)
--- branches/safari-611-branch/Source/_javascript_Core/API/JSValueRef.cpp 2021-02-10 20:25:42 UTC (rev 272674)
+++ branches/safari-611-branch/Source/_javascript_Core/API/JSValueRef.cpp 2021-02-10 20:25:46 UTC (rev 272675)
@@ -54,13 +54,10 @@
ASSERT_NOT_REACHED();
return kJSTypeUndefined;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
JSValue jsValue = toJS(globalObject, value);
-#else
- JSValue jsValue = toJS(value);
-#endif
if (jsValue.isUndefined())
return kJSTypeUndefined;
@@ -84,13 +81,10 @@
ASSERT_NOT_REACHED();
return false;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toJS(globalObject, value).isUndefined();
-#else
- return toJS(value).isUndefined();
-#endif
}
bool JSValueIsNull(JSContextRef ctx, JSValueRef value)
@@ -99,14 +93,10 @@
ASSERT_NOT_REACHED();
return false;
}
-
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toJS(globalObject, value).isNull();
-#else
- return toJS(value).isNull();
-#endif
}
bool JSValueIsBoolean(JSContextRef ctx, JSValueRef value)
@@ -115,13 +105,10 @@
ASSERT_NOT_REACHED();
return false;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toJS(globalObject, value).isBoolean();
-#else
- return toJS(value).isBoolean();
-#endif
}
bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
@@ -130,13 +117,10 @@
ASSERT_NOT_REACHED();
return false;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toJS(globalObject, value).isNumber();
-#else
- return toJS(value).isNumber();
-#endif
}
bool JSValueIsString(JSContextRef ctx, JSValueRef value)
@@ -145,13 +129,10 @@
ASSERT_NOT_REACHED();
return false;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toJS(globalObject, value).isString();
-#else
- return toJS(value).isString();
-#endif
}
bool JSValueIsObject(JSContextRef ctx, JSValueRef value)
@@ -160,13 +141,10 @@
ASSERT_NOT_REACHED();
return false;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toJS(globalObject, value).isObject();
-#else
- return toJS(value).isObject();
-#endif
}
bool JSValueIsSymbol(JSContextRef ctx, JSValueRef value)
@@ -175,13 +153,10 @@
ASSERT_NOT_REACHED();
return false;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toJS(globalObject, value).isSymbol();
-#else
- return toJS(value).isSymbol();
-#endif
}
bool JSValueIsArray(JSContextRef ctx, JSValueRef value)
@@ -302,13 +277,10 @@
ASSERT_NOT_REACHED();
return nullptr;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toRef(globalObject, jsUndefined());
-#else
- return toRef(jsUndefined());
-#endif
}
JSValueRef JSValueMakeNull(JSContextRef ctx)
@@ -317,13 +289,10 @@
ASSERT_NOT_REACHED();
return nullptr;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toRef(globalObject, jsNull());
-#else
- return toRef(jsNull());
-#endif
}
JSValueRef JSValueMakeBoolean(JSContextRef ctx, bool value)
@@ -332,13 +301,10 @@
ASSERT_NOT_REACHED();
return nullptr;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toRef(globalObject, jsBoolean(value));
-#else
- return toRef(jsBoolean(value));
-#endif
}
JSValueRef JSValueMakeNumber(JSContextRef ctx, double value)
@@ -347,13 +313,10 @@
ASSERT_NOT_REACHED();
return nullptr;
}
-#if !CPU(ADDRESS64)
JSGlobalObject* globalObject = toJS(ctx);
JSLockHolder locker(globalObject);
+
return toRef(globalObject, jsNumber(purifyNaN(value)));
-#else
- return toRef(jsNumber(purifyNaN(value)));
-#endif
}
JSValueRef JSValueMakeSymbol(JSContextRef ctx, JSStringRef description)
Modified: branches/safari-611-branch/Source/_javascript_Core/ChangeLog (272674 => 272675)
--- branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-02-10 20:25:42 UTC (rev 272674)
+++ branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-02-10 20:25:46 UTC (rev 272675)
@@ -1,5 +1,9 @@
2021-02-10 Alan Coon <alanc...@apple.com>
+ Revert r272538. rdar://problem/74183111
+
+2021-02-10 Alan Coon <alanc...@apple.com>
+
Revert r272539. rdar://problem/74183111
2021-02-08 Russell Epstein <repst...@apple.com>
