Diff
Modified: trunk/Source/_javascript_Core/API/JSCallbackObject.h (205941 => 205942)
--- trunk/Source/_javascript_Core/API/JSCallbackObject.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/API/JSCallbackObject.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -149,19 +149,7 @@
void setPrivate(void* data);
void* getPrivate();
- // FIXME: We should fix the warnings for extern-template in JSObject template classes: https://bugs.webkit.org/show_bug.cgi?id=161979
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-var-template"
-#endif
-#endif
DECLARE_INFO;
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic pop
-#endif
-#endif
JSClassRef classRef() const { return m_callbackObjectData->jsClass; }
bool inherits(JSClassRef) const;
Modified: trunk/Source/_javascript_Core/ChangeLog (205941 => 205942)
--- trunk/Source/_javascript_Core/ChangeLog 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-09-15 00:33:36 UTC (rev 205942)
@@ -1,3 +1,20 @@
+2016-09-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r205933 and r205936.
+ https://bugs.webkit.org/show_bug.cgi?id=162002
+
+ broke the build (Requested by keith_miller on #webkit).
+
+ Reverted changesets:
+
+ "Pragma out undefined-var-template warnings in JSC for
+ JSObjects that are templatized"
+ https://bugs.webkit.org/show_bug.cgi?id=161985
+ http://trac.webkit.org/changeset/205933
+
+ "Unreviewed, fix the Windows build."
+ http://trac.webkit.org/changeset/205936
+
2016-09-14 Chris Dumez <[email protected]>
REGRESSION (r205670): ASSERTION FAILED: methodTable(vm)->toThis(this, exec, NotStrictMode) == this
Modified: trunk/Source/_javascript_Core/b3/B3ValueInlines.h (205941 => 205942)
--- trunk/Source/_javascript_Core/b3/B3ValueInlines.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/b3/B3ValueInlines.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -56,7 +56,7 @@
}
template<typename T>
-inline T* Value::as()
+T* Value::as()
{
if (T::accepts(opcode()))
return static_cast<T*>(this);
@@ -64,7 +64,7 @@
}
template<typename T>
-inline const T* Value::as() const
+const T* Value::as() const
{
return const_cast<Value*>(this)->as<T>();
}
Modified: trunk/Source/_javascript_Core/runtime/HashMapImpl.cpp (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/HashMapImpl.cpp 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/HashMapImpl.cpp 2016-09-15 00:33:36 UTC (rev 205942)
@@ -31,11 +31,11 @@
namespace JSC {
template<>
-const ClassInfo HashMapBucket<HashMapBucketDataKey>::s_info =
+const JS_EXPORTDATA ClassInfo HashMapBucket<HashMapBucketDataKey>::s_info =
{ "HashMapBucket", nullptr, 0, CREATE_METHOD_TABLE(HashMapBucket<HashMapBucketDataKey>) };
template<>
-const ClassInfo HashMapBucket<HashMapBucketDataKeyValue>::s_info =
+const JS_EXPORTDATA ClassInfo HashMapBucket<HashMapBucketDataKeyValue>::s_info =
{ "HashMapBucket", nullptr, 0, CREATE_METHOD_TABLE(HashMapBucket<HashMapBucketDataKeyValue>) };
template <typename Data>
@@ -53,11 +53,11 @@
}
template<>
-const ClassInfo HashMapImpl<HashMapBucket<HashMapBucketDataKey>>::s_info =
+const JS_EXPORTDATA ClassInfo HashMapImpl<HashMapBucket<HashMapBucketDataKey>>::s_info =
{ "HashMapImpl", nullptr, 0, CREATE_METHOD_TABLE(HashMapImpl<HashMapBucket<HashMapBucketDataKey>>) };
template<>
-const ClassInfo HashMapImpl<HashMapBucket<HashMapBucketDataKeyValue>>::s_info =
+const JS_EXPORTDATA ClassInfo HashMapImpl<HashMapBucket<HashMapBucketDataKeyValue>>::s_info =
{ "HashMapImpl", nullptr, 0, CREATE_METHOD_TABLE(HashMapImpl<HashMapBucket<HashMapBucketDataKeyValue>>) };
template <typename HashMapBucket>
Modified: trunk/Source/_javascript_Core/runtime/HashMapImpl.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/HashMapImpl.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/HashMapImpl.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -56,21 +56,8 @@
}
public:
+ DECLARE_EXPORT_INFO;
- // FIXME: We should fix the warnings for extern-template in JSObject template classes: https://bugs.webkit.org/show_bug.cgi?id=161979
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-var-template"
-#endif
-#endif
- DECLARE_INFO;
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic pop
-#endif
-#endif
-
static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
{
return Structure::create(vm, globalObject, prototype, TypeInfo(CellType, StructureFlags), info());
@@ -278,19 +265,7 @@
}
public:
- // FIXME: We should fix the warnings for extern-template in JSObject template classes: https://bugs.webkit.org/show_bug.cgi?id=161979
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-var-template"
-#endif
-#endif
- DECLARE_INFO;
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic pop
-#endif
-#endif
+ DECLARE_EXPORT_INFO;
static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
{
Modified: trunk/Source/_javascript_Core/runtime/JSCJSValue.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/JSCJSValue.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/JSCJSValue.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -118,6 +118,17 @@
PayloadWord
};
+// This implements ToInt32, defined in ECMA-262 9.5.
+JS_EXPORT_PRIVATE int32_t toInt32(double);
+
+// This implements ToUInt32, defined in ECMA-262 9.6.
+inline uint32_t toUInt32(double number)
+{
+ // As commented in the spec, the operation of ToInt32 and ToUint32 only differ
+ // in how the result is interpreted; see NOTEs in sections 9.5 and 9.6.
+ return toInt32(number);
+}
+
int64_t tryConvertToInt52(double);
bool isInt52(double);
Modified: trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayView.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayView.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayView.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -159,7 +159,7 @@
void setIndexQuicklyToDouble(unsigned i, double value)
{
- setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(jsNumber(value)));
+ setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
}
void setIndexQuickly(unsigned i, JSValue value)
Modified: trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewConstructor.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewConstructor.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewConstructor.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -43,19 +43,7 @@
static JSGenericTypedArrayViewConstructor* create(
VM&, JSGlobalObject*, Structure*, JSObject* prototype, const String& name, FunctionExecutable* privateAllocator);
- // FIXME: We should fix the warnings for extern-template in JSObject template classes: https://bugs.webkit.org/show_bug.cgi?id=161979
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-var-template"
-#endif
-#endif
DECLARE_INFO;
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic pop
-#endif
-#endif
static Structure* createStructure(VM&, JSGlobalObject*, JSValue prototype);
Modified: trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewPrototype.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewPrototype.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewPrototype.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -42,20 +42,8 @@
public:
static JSGenericTypedArrayViewPrototype* create(
VM&, JSGlobalObject*, Structure*);
-
- // FIXME: We should fix the warnings for extern-template in JSObject template classes: https://bugs.webkit.org/show_bug.cgi?id=161979
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-var-template"
-#endif
-#endif
+
DECLARE_INFO;
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic pop
-#endif
-#endif
static Structure* createStructure(VM&, JSGlobalObject*, JSValue prototype);
};
Modified: trunk/Source/_javascript_Core/runtime/MathCommon.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/MathCommon.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/MathCommon.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -111,14 +111,6 @@
return bits < 0 ? -result : result;
}
-// This implements ToUInt32, defined in ECMA-262 9.6.
-inline uint32_t toUInt32(double number)
-{
- // As commented in the spec, the operation of ToInt32 and ToUint32 only differ
- // in how the result is interpreted; see NOTEs in sections 9.5 and 9.6.
- return toInt32(number);
-}
-
inline Optional<double> safeReciprocalForDivByConst(double constant)
{
// No "weird" numbers (NaN, Denormal, etc).
Modified: trunk/Source/_javascript_Core/runtime/TypedArrayAdaptors.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/TypedArrayAdaptors.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/TypedArrayAdaptors.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -27,7 +27,6 @@
#define TypedArrayAdaptors_h
#include "JSCJSValue.h"
-#include "MathCommon.h"
#include "TypedArrayType.h"
#include <wtf/MathExtras.h>
Modified: trunk/Source/_javascript_Core/runtime/VM.h (205941 => 205942)
--- trunk/Source/_javascript_Core/runtime/VM.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -252,13 +252,13 @@
JS_EXPORT_PRIVATE ~VM();
JS_EXPORT_PRIVATE Watchdog& ensureWatchdog();
- Watchdog* watchdog() { return m_watchdog.get(); }
+ JS_EXPORT_PRIVATE Watchdog* watchdog() { return m_watchdog.get(); }
- HeapProfiler* heapProfiler() const { return m_heapProfiler.get(); }
+ JS_EXPORT_PRIVATE HeapProfiler* heapProfiler() const { return m_heapProfiler.get(); }
JS_EXPORT_PRIVATE HeapProfiler& ensureHeapProfiler();
#if ENABLE(SAMPLING_PROFILER)
- SamplingProfiler* samplingProfiler() { return m_samplingProfiler.get(); }
+ JS_EXPORT_PRIVATE SamplingProfiler* samplingProfiler() { return m_samplingProfiler.get(); }
JS_EXPORT_PRIVATE SamplingProfiler& ensureSamplingProfiler(RefPtr<Stopwatch>&&);
#endif
Modified: trunk/Source/WTF/ChangeLog (205941 => 205942)
--- trunk/Source/WTF/ChangeLog 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/WTF/ChangeLog 2016-09-15 00:33:36 UTC (rev 205942)
@@ -1,3 +1,20 @@
+2016-09-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r205933 and r205936.
+ https://bugs.webkit.org/show_bug.cgi?id=162002
+
+ broke the build (Requested by keith_miller on #webkit).
+
+ Reverted changesets:
+
+ "Pragma out undefined-var-template warnings in JSC for
+ JSObjects that are templatized"
+ https://bugs.webkit.org/show_bug.cgi?id=161985
+ http://trac.webkit.org/changeset/205933
+
+ "Unreviewed, fix the Windows build."
+ http://trac.webkit.org/changeset/205936
+
2016-09-14 Keith Miller <[email protected]>
Pragma out undefined-var-template warnings in JSC for JSObjects that are templatized
Modified: trunk/Source/WTF/wtf/MetaAllocator.h (205941 => 205942)
--- trunk/Source/WTF/wtf/MetaAllocator.h 2016-09-15 00:19:12 UTC (rev 205941)
+++ trunk/Source/WTF/wtf/MetaAllocator.h 2016-09-15 00:33:36 UTC (rev 205942)
@@ -97,7 +97,7 @@
// builds.
WTF_EXPORT_PRIVATE size_t debugFreeSpaceSize();
- Lock& getLock() { return m_lock; }
+ WTF_EXPORT_PRIVATE Lock& getLock() { return m_lock; }
WTF_EXPORT_PRIVATE bool isInAllocatedMemory(const LockHolder&, void* address);
#if ENABLE(META_ALLOCATOR_PROFILE)
