Title: [212523] branches/safari-603-branch/Source/_javascript_Core
- Revision
- 212523
- Author
- keith_mil...@apple.com
- Date
- 2017-02-16 21:11:00 -0800 (Thu, 16 Feb 2017)
Log Message
Fix merge issue with r212085 (rdar://problem/29939864).
* runtime/JSFunction.cpp:
(JSC::JSFunction::callerGetter):
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (212522 => 212523)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-02-17 04:30:45 UTC (rev 212522)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-02-17 05:11:00 UTC (rev 212523)
@@ -1,3 +1,10 @@
+2017-02-16 Keith Miller <keith_mil...@apple.com>
+
+ Fix merge issue with r212085 (rdar://problem/29939864).
+
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::callerGetter):
+
2017-02-12 Babak Shafiei <bshaf...@apple.com>
Merge r211609.
Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/JSFunction.cpp (212522 => 212523)
--- branches/safari-603-branch/Source/_javascript_Core/runtime/JSFunction.cpp 2017-02-17 04:30:45 UTC (rev 212522)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/JSFunction.cpp 2017-02-17 05:11:00 UTC (rev 212523)
@@ -324,7 +324,6 @@
// See ES5.1 15.3.5.4 - Function.caller may not be used to retrieve a strict caller.
if (!caller.isObject() || !asObject(caller)->inherits(JSFunction::info())) {
// It isn't a JSFunction, but if it is a JSCallee from a program or eval call or an internal constructor, return null.
- if (jsDynamicCast<JSCallee*>(caller))
if (jsDynamicCast<JSCallee*>(caller) || jsDynamicCast<InternalFunction*>(caller))
return JSValue::encode(jsNull());
return JSValue::encode(caller);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
