[JavaScriptCore] FTL buildfix for EFL platform.

LaszloLango · LaszloLango · commit a2b7d3b400ad · 2014-06-27T07:28:49.000Z
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): Canonical link: https://commits.webkit.org/152365@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170525 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -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
diff --git a/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp b/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp
@@ -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;
diff --git a/Source/JavaScriptCore/ftl/FTLLocation.cpp b/Source/JavaScriptCore/ftl/FTLLocation.cpp
@@ -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
diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
@@ -4854,6 +4854,7 @@ class LowerDFGToLLVM {
             return Int52;
         }
         RELEASE_ASSERT_NOT_REACHED();
+        return Int52;
     }
     
     LValue lowWhicheverInt52(Edge edge, Int52Kind& kind)
diff --git a/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp b/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
@@ -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];
diff --git a/Source/JavaScriptCore/ftl/FTLStackMaps.cpp b/Source/JavaScriptCore/ftl/FTLStackMaps.cpp
@@ -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)
diff --git a/Source/JavaScriptCore/llvm/InitializeLLVMPOSIX.cpp b/Source/JavaScriptCore/llvm/InitializeLLVMPOSIX.cpp
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ Location Location::forStackmaps(const StackMaps* stackmaps, const StackMaps::Loc`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`RELEASE_ASSERT_NOT_REACHED();`
	`62`	`+`
	`63`	`+ return Location();`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`void Location::dump(PrintStream& out) const`
Original file line number	Diff line number	Diff line change
`@@ -4854,6 +4854,7 @@ class LowerDFGToLLVM {`
`4854`	`4854`	`return Int52;`
`4855`	`4855`	`}`
`4856`	`4856`	`RELEASE_ASSERT_NOT_REACHED();`
	`4857`	`+ return Int52;`
`4857`	`4858`	`}`
`4858`	`4859`
`4859`	`4860`	`LValue lowWhicheverInt52(Edge edge, Int52Kind& kind)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ using namespace DFG;`
`49`	`49`	`static void compileStub(`
`50`	`50`	`unsigned exitID, JITCode* jitCode, OSRExit& exit, VM* vm, CodeBlock* codeBlock)`
`51`	`51`	`{`
`52`		`- StackMaps::Record* record;`
	`52`	`+ StackMaps::Record* record = nullptr;`
`53`	`53`
`54`	`54`	`for (unsigned i = jitCode->stackmaps.records.size(); i--;) {`
`55`	`55`	`record = &jitCode->stackmaps.records[i];`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void StackMaps::Constant::parse(StackMaps::ParseContext& context)`
`50`	`50`
`51`	`51`	`void StackMaps::Constant::dump(PrintStream& out) const`
`52`	`52`	`{`
`53`		`- out.printf("0x%016llx", integer);`
	`53`	`+ out.printf("0x%016llx", static_cast<unsigned long long>(integer));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`void StackMaps::StackSize::parse(StackMaps::ParseContext& context)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`
`36`	`36`	`namespace JSC {`
`37`	`37`
`38`		`-typedef LLVMAPI* (InitializerFunction)(void ()(const char*, ...));`
	`38`	`+typedef void (LoggerFunction)(const char, ...) WTF_ATTRIBUTE_PRINTF(1, 2);`
	`39`	`+typedef LLVMAPI* (*InitializerFunction)(LoggerFunction);`
`39`	`40`
`40`	`41`	`void initializeLLVMPOSIX(const char* libraryName)`
`41`	`42`	`{`