Source/JavaScriptCore: Debug build fix after r163946.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2014 05:54:02 +0000 (05:54 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2014 05:54:02 +0000 (05:54 +0000)
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::injectLazyOperandSpeculation):

Source/WebKit2: Remove one of includes added in r163943 and r163939.

* WebProcess/WebPage/WebPage.h:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/WebPage.h

index c56252c1e358fd004c95d2a49b1c4a727a4f4a9e..9fa9a2385daf0fdeb9f95d9c5b8fd9b2f97880da 100644 (file)
@@ -1,3 +1,10 @@
+2014-02-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Debug build fix after r163946.
+
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::injectLazyOperandSpeculation):
+
 2014-02-11  Filip Pizlo  <fpizlo@apple.com>
 
         Inserting a node with a codeOrigin "like" another node should copy both the codeOrigin and codeOriginForExitTarget
index 6d6376b2f50ede31f2d63cb719abc7f6023e0887..d6bc292720833ebf402b19bf84272408c2787599 100644 (file)
@@ -258,7 +258,7 @@ private:
     Node* injectLazyOperandSpeculation(Node* node)
     {
         ASSERT(node->op() == GetLocal);
-        ASSERT(node->codeOrigin.bytecodeIndex == m_currentIndex);
+        ASSERT(node->origin.semantic.bytecodeIndex == m_currentIndex);
         ConcurrentJITLocker locker(m_inlineStackTop->m_profiledBlock->m_lock);
         LazyOperandValueProfileKey key(m_currentIndex, node->local());
         SpeculatedType prediction = m_inlineStackTop->m_lazyOperands.prediction(locker, key);
index 670a0ee657d4e9eef741c13ba0abd0a046877c6a..cc9b7c54a2eeefcbbbbbd6b3b63835a7cf95f228 100644 (file)
@@ -1,3 +1,9 @@
+2014-02-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Remove one of includes added in r163943 and r163939.
+
+        * WebProcess/WebPage/WebPage.h:
+
 2014-02-11  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/16044438>: WebKit2.framework (with *Process.app) exists at the top level of the simulator
index edde975397c7d1d2b4655268d5cc6bc0a003c798..2c7d42546744ccce07f44518915c188c2ee14676 100644 (file)
@@ -105,10 +105,6 @@ OBJC_CLASS WKAccessibilityWebPageObject;
 #define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
 #endif
 
-#if PLATFORM(IOS)
-#include "WKGestureTypes.h"
-#endif
-
 namespace API {
 class Array;
 }