Title: [197590] trunk/Source/_javascript_Core
- Revision
- 197590
- Author
- [email protected]
- Date
- 2016-03-04 14:18:10 -0800 (Fri, 04 Mar 2016)
Log Message
REGRESSION (r197531): _javascript_Core ASan build fails due to weak external symbol
<http://webkit.org/b/155033>
<rdar://problem/24979661>
Reviewed by Alexey Proskuryakov.
* runtime/JSObject.cpp:
(JSC::JSObject::ordinaryToPrimitive): Don't mark this method
inline since it's also used in DatePrototype.cpp, and is
declared as a public class method.
* runtime/JSObject.h:
(JSC::JSObject::ordinaryToPrimitive): Don't export this method
since it is not used outside of _javascript_Core.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (197589 => 197590)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-04 22:07:39 UTC (rev 197589)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-03-04 22:18:10 UTC (rev 197590)
@@ -1,3 +1,19 @@
+2016-03-04 David Kilzer <[email protected]>
+
+ REGRESSION (r197531): _javascript_Core ASan build fails due to weak external symbol
+ <http://webkit.org/b/155033>
+ <rdar://problem/24979661>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::ordinaryToPrimitive): Don't mark this method
+ inline since it's also used in DatePrototype.cpp, and is
+ declared as a public class method.
+ * runtime/JSObject.h:
+ (JSC::JSObject::ordinaryToPrimitive): Don't export this method
+ since it is not used outside of _javascript_Core.
+
2016-03-04 Alex Christensen <[email protected]>
Remove vcxproj build system
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (197589 => 197590)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2016-03-04 22:07:39 UTC (rev 197589)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2016-03-04 22:18:10 UTC (rev 197590)
@@ -1468,7 +1468,7 @@
}
// ECMA 7.1.1
-inline JSValue JSObject::ordinaryToPrimitive(ExecState* exec, PreferredPrimitiveType hint) const
+JSValue JSObject::ordinaryToPrimitive(ExecState* exec, PreferredPrimitiveType hint) const
{
// Make sure that whatever default value methods there are on object's prototype chain are
// being watched.
Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (197589 => 197590)
--- trunk/Source/_javascript_Core/runtime/JSObject.h 2016-03-04 22:07:39 UTC (rev 197589)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h 2016-03-04 22:18:10 UTC (rev 197590)
@@ -505,7 +505,7 @@
JS_EXPORT_PRIVATE static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
JS_EXPORT_PRIVATE static JSValue defaultValue(const JSObject*, ExecState*, PreferredPrimitiveType);
- JS_EXPORT_PRIVATE JSValue ordinaryToPrimitive(ExecState*, PreferredPrimitiveType) const;
+ JSValue ordinaryToPrimitive(ExecState*, PreferredPrimitiveType) const;
JS_EXPORT_PRIVATE bool hasInstance(ExecState*, JSValue value, JSValue hasInstanceValue);
bool hasInstance(ExecState*, JSValue);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
