Changeset 189723 in webkit

Timestamp:

Sep 14, 2015 6:20:01 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r189133 - JavaScriptCore fails to build using GCC 5
​https://bugs.webkit.org/show_bug.cgi?id=147815

Patch by Khem Raj <​raj.khem@gmail.com> on 2015-08-28
Reviewed by Filip Pizlo.

• runtime/JSObject.cpp: Explicitly instantiate all variants of

putByIndexBeyondVectorLengthWithAttributes used by JSArray.cpp.

Location:

releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSObject.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-08-28  Khem Raj  <raj.khem@gmail.com>
+
+        JavaScriptCore fails to build using GCC 5
+        https://bugs.webkit.org/show_bug.cgi?id=147815
+
+        Reviewed by Filip Pizlo.
+
+        * runtime/JSObject.cpp: Explicitly instantiate all variants of
+        putByIndexBeyondVectorLengthWithAttributes used by JSArray.cpp.
+
 2015-08-27  Basile Clement  <basile_clement@apple.com>
 

releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -1947 +1947 @@
 }
 
+// Explicit instantiations needed by JSArray.cpp.
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState*, unsigned, JSValue);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState*, unsigned, JSValue);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState*, unsigned, JSValue);
+
 void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
 {