From 83bc0b764bfdf31930c7dcfbce6743939cc53560 Mon Sep 17 00:00:00 2001 From: "ryuan.choi@samsung.com" Date: Fri, 30 Aug 2013 02:08:32 +0000 Subject: [PATCH] Fix build break after r154861 https://bugs.webkit.org/show_bug.cgi?id=120503 Reviewed by Geoffrey Garen. Unreviewed build fix attempt for GTK, Qt Windows and CMake based ports. * CMakeLists.txt: * GNUmakefile.list.am: * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: * Target.pri: * runtime/MapData.h: (JSC::MapData::KeyType::KeyType): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154864 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/JavaScriptCore/CMakeLists.txt | 4 ++-- Source/JavaScriptCore/ChangeLog | 16 ++++++++++++++++ Source/JavaScriptCore/GNUmakefile.list.am | 8 ++++++-- .../JavaScriptCore.vcxproj.filters | 12 ++++++------ Source/JavaScriptCore/Target.pri | 4 ++-- Source/JavaScriptCore/runtime/MapData.h | 3 ++- 6 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt index bf0e947..e1541c0 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -335,8 +335,6 @@ set(JavaScriptCore_SOURCES runtime/JSGlobalObjectFunctions.cpp runtime/JSLock.cpp runtime/JSMap.cpp - runtime/JSMapConstructor.cpp - runtime/JSMapPrototype.cpp runtime/JSNameScope.cpp runtime/JSNotAnObject.cpp runtime/JSONObject.cpp @@ -364,7 +362,9 @@ set(JavaScriptCore_SOURCES runtime/JSWrapperObject.cpp runtime/LiteralParser.cpp runtime/Lookup.cpp + runtime/MapConstructor.cpp runtime/MapData.cpp + runtime/MapPrototype.cpp runtime/MathObject.cpp runtime/MemoryStatistics.cpp runtime/NameConstructor.cpp diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index e6e8a28..58faeaf 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,19 @@ +2013-08-29 Ryuan Choi + + Fix build break after r154861 + https://bugs.webkit.org/show_bug.cgi?id=120503 + + Reviewed by Geoffrey Garen. + + Unreviewed build fix attempt for GTK, Qt Windows and CMake based ports. + + * CMakeLists.txt: + * GNUmakefile.list.am: + * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: + * Target.pri: + * runtime/MapData.h: + (JSC::MapData::KeyType::KeyType): + 2013-08-29 Andreas Kling CodeBlock: LLIntCallLinkInfo vector can be sized-to-fit at creation. diff --git a/Source/JavaScriptCore/GNUmakefile.list.am b/Source/JavaScriptCore/GNUmakefile.list.am index fa0e82a..b4c190c 100644 --- a/Source/JavaScriptCore/GNUmakefile.list.am +++ b/Source/JavaScriptCore/GNUmakefile.list.am @@ -873,8 +873,6 @@ javascriptcore_sources += \ Source/JavaScriptCore/runtime/JSLock.cpp \ Source/JavaScriptCore/runtime/JSLock.h \ Source/JavaScriptCore/runtime/JSMap.cpp \ - Source/JavaScriptCore/runtime/JSMapConstructor.cpp \ - Source/JavaScriptCore/runtime/JSMapPrototype.cpp \ Source/JavaScriptCore/runtime/JSNotAnObject.cpp \ Source/JavaScriptCore/runtime/JSNotAnObject.h \ Source/JavaScriptCore/runtime/JSObject.cpp \ @@ -935,6 +933,12 @@ javascriptcore_sources += \ Source/JavaScriptCore/runtime/LiteralParser.h \ Source/JavaScriptCore/runtime/Lookup.cpp \ Source/JavaScriptCore/runtime/Lookup.h \ + Source/JavaScriptCore/runtime/MapConstructor.cpp \ + Source/JavaScriptCore/runtime/MapConstructor.h\ + Source/JavaScriptCore/runtime/MapData.cpp \ + Source/JavaScriptCore/runtime/MapData.h \ + Source/JavaScriptCore/runtime/MapPrototype.cpp \ + Source/JavaScriptCore/runtime/MapPrototype.h \ Source/JavaScriptCore/runtime/MatchResult.h \ Source/JavaScriptCore/runtime/MathObject.cpp \ Source/JavaScriptCore/runtime/MathObject.h \ diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters index 44f2a971..8954fd8 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters +++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters @@ -576,12 +576,6 @@ runtime - - runtime - - - runtime - runtime @@ -630,9 +624,15 @@ runtime + + runtime + runtime + + runtime + runtime diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri index 0f9147c..38d7fa9b 100644 --- a/Source/JavaScriptCore/Target.pri +++ b/Source/JavaScriptCore/Target.pri @@ -324,8 +324,6 @@ SOURCES += \ runtime/JSGlobalObjectFunctions.cpp \ runtime/JSLock.cpp \ runtime/JSMap.cpp \ - runtime/JSMapConstructor.cpp \ - runtime/JSPrototype.cpp \ runtime/JSNameScope.cpp \ runtime/JSNameScope.cpp \ runtime/JSNotAnObject.cpp \ @@ -353,7 +351,9 @@ SOURCES += \ runtime/JSWrapperObject.cpp \ runtime/LiteralParser.cpp \ runtime/Lookup.cpp \ + runtime/MapConstructor.cpp \ runtime/MapData.cpp \ + runtime/Prototype.cpp \ runtime/MathObject.cpp \ runtime/MemoryStatistics.cpp \ runtime/NameConstructor.cpp \ diff --git a/Source/JavaScriptCore/runtime/MapData.h b/Source/JavaScriptCore/runtime/MapData.h index f402e8e..5d885ce 100644 --- a/Source/JavaScriptCore/runtime/MapData.h +++ b/Source/JavaScriptCore/runtime/MapData.h @@ -32,6 +32,7 @@ #include #include +#include namespace JSC { @@ -148,7 +149,7 @@ ALWAYS_INLINE MapData::KeyType::KeyType(JSValue v) return; } double d = v.asDouble(); - if (std::isnan(d) || (signbit(d) && d == 0.0)) { + if (std::isnan(d) || (std::signbit(d) && d == 0.0)) { value = v; return; } -- 1.8.3.1