Title: [175802] trunk/Source/_javascript_Core
- Revision
- 175802
- Author
- [email protected]
- Date
- 2014-11-10 00:00:36 -0800 (Mon, 10 Nov 2014)
Log Message
Fix 'noreturn' function does return warning in LLVMOverrides.cpp
https://bugs.webkit.org/show_bug.cgi?id=138306
Patch by Akos Kiss <[email protected]> on 2014-11-09
Reviewed by Filip Pizlo.
Adding NO_RETURN where needed.
* llvm/library/LLVMExports.cpp:
(initializeAndGetJSCLLVMAPI):
* llvm/library/LLVMOverrides.cpp:
* llvm/library/LLVMTrapCallback.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (175801 => 175802)
--- trunk/Source/_javascript_Core/ChangeLog 2014-11-10 07:59:26 UTC (rev 175801)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-11-10 08:00:36 UTC (rev 175802)
@@ -1,3 +1,17 @@
+2014-11-09 Akos Kiss <[email protected]>
+
+ Fix 'noreturn' function does return warning in LLVMOverrides.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=138306
+
+ Reviewed by Filip Pizlo.
+
+ Adding NO_RETURN where needed.
+
+ * llvm/library/LLVMExports.cpp:
+ (initializeAndGetJSCLLVMAPI):
+ * llvm/library/LLVMOverrides.cpp:
+ * llvm/library/LLVMTrapCallback.h:
+
2014-11-07 Dániel Bátyai <[email protected]>
Fix an alignment issue with operationPushCatchScope on ARMv7
Modified: trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp (175801 => 175802)
--- trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp 2014-11-10 07:59:26 UTC (rev 175801)
+++ trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp 2014-11-10 08:00:36 UTC (rev 175802)
@@ -53,14 +53,15 @@
#undef __STDC_LIMIT_MACROS
#undef __STDC_CONSTANT_MACROS
-extern "C" WTF_EXPORT_PRIVATE JSC::LLVMAPI* initializeAndGetJSCLLVMAPI(void (*)(const char*, ...));
+static void llvmCrash(const char*) NO_RETURN;
+extern "C" WTF_EXPORT_PRIVATE JSC::LLVMAPI* initializeAndGetJSCLLVMAPI(void (*)(const char*, ...) NO_RETURN);
static void llvmCrash(const char* reason)
{
g_llvmTrapCallback("LLVM fatal error: %s", reason);
}
-extern "C" JSC::LLVMAPI* initializeAndGetJSCLLVMAPI(void (*callback)(const char*, ...))
+extern "C" JSC::LLVMAPI* initializeAndGetJSCLLVMAPI(void (*callback)(const char*, ...) NO_RETURN)
{
g_llvmTrapCallback = callback;
Modified: trunk/Source/_javascript_Core/llvm/library/LLVMOverrides.cpp (175801 => 175802)
--- trunk/Source/_javascript_Core/llvm/library/LLVMOverrides.cpp 2014-11-10 07:59:26 UTC (rev 175801)
+++ trunk/Source/_javascript_Core/llvm/library/LLVMOverrides.cpp 2014-11-10 08:00:36 UTC (rev 175802)
@@ -32,13 +32,13 @@
extern "C" int __cxa_atexit();
extern "C" int __cxa_atexit() { return 0; }
-void (*g_llvmTrapCallback)(const char* message, ...);
+void (*g_llvmTrapCallback)(const char* message, ...) NO_RETURN;
// If LLVM tries to raise signals, abort, or fail an assertion, then let
// WebKit handle it instead of trapping.
extern "C" int raise(int signal);
-extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* _expression_);
-extern "C" void abort(void);
+extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* _expression_) NO_RETURN;
+extern "C" void abort(void) NO_RETURN;
extern "C" int raise(int signal)
{
Modified: trunk/Source/_javascript_Core/llvm/library/LLVMTrapCallback.h (175801 => 175802)
--- trunk/Source/_javascript_Core/llvm/library/LLVMTrapCallback.h 2014-11-10 07:59:26 UTC (rev 175801)
+++ trunk/Source/_javascript_Core/llvm/library/LLVMTrapCallback.h 2014-11-10 08:00:36 UTC (rev 175802)
@@ -26,7 +26,9 @@
#ifndef LLVMTrapCallback_h
#define LLVMTrapCallback_h
-extern void (*g_llvmTrapCallback)(const char* message, ...);
+#include <wtf/Assertions.h>
+extern void (*g_llvmTrapCallback)(const char* message, ...) NO_RETURN;
+
#endif // LLVMTrapCallback_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
