summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore')
-rw-r--r--Source/JavaScriptCore/ChangeLog13
-rw-r--r--Source/JavaScriptCore/bytecode/CodeBlock.h2
2 files changed, 14 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 638d594c7..798086160 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-12-07 Jonathan Liu <net147@gmail.com>
+
+ Add missing const qualifier to JSC::CodeBlock::getJITType()
+ https://bugs.webkit.org/show_bug.cgi?id=104424
+
+ Reviewed by Laszlo Gombos.
+
+ JSC::CodeBlock::getJITType() has the const qualifier when JIT is
+ enabled but is missing the const qualifier when JIT is disabled.
+
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::getJITType):
+
2012-11-30 Pierre Rossi <pierre.rossi@gmail.com>
[Qt] Unreviewed speculative Mac build fix after r136232
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.h b/Source/JavaScriptCore/bytecode/CodeBlock.h
index 20f1e7452..eec95cac1 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.h
@@ -521,7 +521,7 @@ namespace JSC {
return result;
}
#else
- JITCode::JITType getJITType() { return JITCode::BaselineJIT; }
+ JITCode::JITType getJITType() const { return JITCode::BaselineJIT; }
#endif
ScriptExecutable* ownerExecutable() const { return m_ownerExecutable.get(); }