[JavaScriptCore] FTL buildfix for EFL platform.
authorllango.u-szeged@partner.samsung.com <llango.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jun 2014 07:28:49 +0000 (07:28 +0000)
committerllango.u-szeged@partner.samsung.com <llango.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jun 2014 07:28:49 +0000 (07:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=133546

Reviewed by Darin Adler.

* ftl/FTLAbstractHeap.cpp:
(JSC::FTL::IndexedAbstractHeap::IndexedAbstractHeap):
* ftl/FTLLocation.cpp:
(JSC::FTL::Location::forStackmaps):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::opposite):
* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::compileStub):
* ftl/FTLStackMaps.cpp:
(JSC::FTL::StackMaps::Constant::dump):
* llvm/InitializeLLVMPOSIX.cpp:
(JSC::initializeLLVMPOSIX):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp
Source/JavaScriptCore/ftl/FTLLocation.cpp
Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
Source/JavaScriptCore/ftl/FTLStackMaps.cpp
Source/JavaScriptCore/llvm/InitializeLLVMPOSIX.cpp

index f0ad0e6..c032e8e 100644 (file)
@@ -1,3 +1,23 @@
+2014-06-27  László Langó  <llango.u-szeged@partner.samsung.com>
+
+        [JavaScriptCore] FTL buildfix for EFL platform.
+        https://bugs.webkit.org/show_bug.cgi?id=133546
+
+        Reviewed by Darin Adler.
+
+        * ftl/FTLAbstractHeap.cpp:
+        (JSC::FTL::IndexedAbstractHeap::IndexedAbstractHeap):
+        * ftl/FTLLocation.cpp:
+        (JSC::FTL::Location::forStackmaps):
+        * ftl/FTLLowerDFGToLLVM.cpp:
+        (JSC::FTL::LowerDFGToLLVM::opposite):
+        * ftl/FTLOSRExitCompiler.cpp:
+        (JSC::FTL::compileStub):
+        * ftl/FTLStackMaps.cpp:
+        (JSC::FTL::StackMaps::Constant::dump):
+        * llvm/InitializeLLVMPOSIX.cpp:
+        (JSC::initializeLLVMPOSIX):
+
 2014-06-26  Benjamin Poulain  <benjamin@webkit.org>
 
         iOS 8 beta 2 ES6 'Set' clear() broken
index 8561f8e..dfbbeb1 100644 (file)
@@ -64,7 +64,7 @@ IndexedAbstractHeap::IndexedAbstractHeap(LContext context, AbstractHeap* parent,
     // See if there is a common shift amount we could use instead of multiplying. Don't
     // try too hard. This is just a speculative optimization to reduce load on LLVM.
     for (unsigned i = 0; i < 4; ++i) {
-        if ((1 << i) == m_elementSize) {
+        if (1U << i == m_elementSize) {
             if (i)
                 m_scaleTerm = constInt(intPtrType(context), i, ZeroExtend);
             m_canShift = true;
index c55abbe..e009825 100644 (file)
@@ -59,6 +59,8 @@ Location Location::forStackmaps(const StackMaps* stackmaps, const StackMaps::Loc
     }
     
     RELEASE_ASSERT_NOT_REACHED();
+
+    return Location();
 }
 
 void Location::dump(PrintStream& out) const
index 92b45db..29c2cdd 100644 (file)
@@ -4854,6 +4854,7 @@ private:
             return Int52;
         }
         RELEASE_ASSERT_NOT_REACHED();
+        return Int52;
     }
     
     LValue lowWhicheverInt52(Edge edge, Int52Kind& kind)
index 832bd35..734e5a9 100644 (file)
@@ -49,7 +49,7 @@ using namespace DFG;
 static void compileStub(
     unsigned exitID, JITCode* jitCode, OSRExit& exit, VM* vm, CodeBlock* codeBlock)
 {
-    StackMaps::Record* record;
+    StackMaps::Record* record = nullptr;
     
     for (unsigned i = jitCode->stackmaps.records.size(); i--;) {
         record = &jitCode->stackmaps.records[i];
index f79b71b..a8ce12b 100644 (file)
@@ -50,7 +50,7 @@ void StackMaps::Constant::parse(StackMaps::ParseContext& context)
 
 void StackMaps::Constant::dump(PrintStream& out) const
 {
-    out.printf("0x%016llx", integer);
+    out.printf("0x%016llx", static_cast<unsigned long long>(integer));
 }
 
 void StackMaps::StackSize::parse(StackMaps::ParseContext& context)
index 7c6ab91..447e130 100644 (file)
@@ -35,7 +35,8 @@
 
 namespace JSC {
 
-typedef LLVMAPI* (*InitializerFunction)(void (*)(const char*, ...));
+typedef void (*LoggerFunction)(const char*, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
+typedef LLVMAPI* (*InitializerFunction)(LoggerFunction);
 
 void initializeLLVMPOSIX(const char* libraryName)
 {