diff options
| -rw-r--r-- | Source/JavaScriptCore/bytecode/CodeBlock.cpp | 4 | ||||
| -rw-r--r-- | Source/WTF/wtf/Assertions.h | 4 | ||||
| -rw-r--r-- | Source/WTF/wtf/Compiler.h | 2 | ||||
| -rw-r--r-- | Source/WTF/wtf/MathExtras.h | 2 | ||||
| -rw-r--r-- | Source/WTF/wtf/Platform.h | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp index 904e40a4c..efe4424c2 100644 --- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp @@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization() unsigned CodeBlock::numberOfDFGCompiles() { +#if ENABLE(JIT) ASSERT(JITCode::isBaselineCode(getJITType())); return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; +#else + return 0; +#endif } int32_t CodeBlock::codeTypeThresholdMultiplier() const diff --git a/Source/WTF/wtf/Assertions.h b/Source/WTF/wtf/Assertions.h index b8ac68faa..b26fa368f 100644 --- a/Source/WTF/wtf/Assertions.h +++ b/Source/WTF/wtf/Assertions.h @@ -200,7 +200,7 @@ WTF_EXPORT_PRIVATE void WTFCrash() NO_RETURN_DUE_TO_CRASH; #define ASSERT_NOT_REACHED() ((void)0) #define NO_RETURN_DUE_TO_ASSERT -#if COMPILER(INTEL) && !OS(WINDOWS) || COMPILER(RVCT) +#if defined(__cplusplus) && COMPILER(RVCT) template<typename T> inline void assertUnused(T& x) { (void)x; } #define ASSERT_UNUSED(variable, assertion) (assertUnused(variable)) @@ -271,7 +271,7 @@ while (0) /* ASSERT_WITH_MESSAGE_UNUSED */ #if ASSERT_MSG_DISABLED -#if COMPILER(INTEL) && !OS(WINDOWS) || COMPILER(RVCT) +#if defined(__cplusplus) || COMPILER(RVCT) template<typename T> inline void assertWithMessageUnused(T& x) { (void)x; } #define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion, ...) (assertWithMessageUnused(variable)) diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h index 644bbf2db..493894c09 100644 --- a/Source/WTF/wtf/Compiler.h +++ b/Source/WTF/wtf/Compiler.h @@ -312,7 +312,7 @@ /* UNUSED_PARAM */ -#if COMPILER(INTEL) && !(defined(WIN32) || defined(_WIN32)) || COMPILER(RVCT) +#if COMPILER(RVCT) template<typename T> inline void unusedParam(T& x) { (void)x; } #define UNUSED_PARAM(variable) unusedParam(variable) diff --git a/Source/WTF/wtf/MathExtras.h b/Source/WTF/wtf/MathExtras.h index 4ff78df9f..1bdbc6108 100644 --- a/Source/WTF/wtf/MathExtras.h +++ b/Source/WTF/wtf/MathExtras.h @@ -279,7 +279,7 @@ template<typename T> inline T clampTo(double value, T min = defaultMinimumForCla return min; return static_cast<T>(value); } -template<> inline long long int clampTo(double, long long int, long long int); // clampTo does not support long long ints. +template<> long long int clampTo(double, long long int, long long int); // clampTo does not support long long ints. inline int clampToInteger(double value) { diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 1ad7a4743..cf80b762c 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -889,7 +889,7 @@ #define ENABLE_REGEXP_TRACING 0 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ -#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT)) +#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) #define ENABLE_YARR_JIT 1 /* Setting this flag compares JIT results with interpreter results. */ |