Title: [153301] trunk/Source/_javascript_Core
Revision
153301
Author
[email protected]
Date
2013-07-25 00:53:01 -0700 (Thu, 25 Jul 2013)

Log Message

One more fix after FTL upstream.

* Target.pri:
* bytecode/CodeBlock.h:
* bytecode/GetByIdStatus.h:
(JSC::GetByIdStatus::GetByIdStatus):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (153300 => 153301)


--- trunk/Source/_javascript_Core/ChangeLog	2013-07-25 06:09:39 UTC (rev 153300)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-07-25 07:53:01 UTC (rev 153301)
@@ -1,3 +1,12 @@
+2013-07-25  Csaba Osztrogonác  <[email protected]>
+
+        One more fix after FTL upstream.
+
+        * Target.pri:
+        * bytecode/CodeBlock.h:
+        * bytecode/GetByIdStatus.h:
+        (JSC::GetByIdStatus::GetByIdStatus):
+
 2013-07-24  Csaba Osztrogonác  <[email protected]>
 
         Unreviewed buildfix after FTL upstream.

Modified: trunk/Source/_javascript_Core/Target.pri (153300 => 153301)


--- trunk/Source/_javascript_Core/Target.pri	2013-07-25 06:09:39 UTC (rev 153300)
+++ trunk/Source/_javascript_Core/Target.pri	2013-07-25 07:53:01 UTC (rev 153301)
@@ -111,7 +111,6 @@
     debugger/DebuggerActivation.cpp \
     debugger/DebuggerCallFrame.cpp \
     debugger/Debugger.cpp \
-    dfg/DFGAbstractState.cpp \
     dfg/DFGArgumentsSimplificationPhase.cpp \
     dfg/DFGArrayMode.cpp \
     dfg/DFGAssemblyHelpers.cpp \

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (153300 => 153301)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-07-25 06:09:39 UTC (rev 153300)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-07-25 07:53:01 UTC (rev 153301)
@@ -54,6 +54,7 @@
 #include "HandlerInfo.h"
 #include "ObjectAllocationProfile.h"
 #include "Options.h"
+#include "Operations.h"
 #include "Instruction.h"
 #include "JITCode.h"
 #include "JITWriteBarrier.h"

Modified: trunk/Source/_javascript_Core/bytecode/GetByIdStatus.h (153300 => 153301)


--- trunk/Source/_javascript_Core/bytecode/GetByIdStatus.h	2013-07-25 06:09:39 UTC (rev 153300)
+++ trunk/Source/_javascript_Core/bytecode/GetByIdStatus.h	2013-07-25 07:53:01 UTC (rev 153301)
@@ -60,7 +60,7 @@
     
     GetByIdStatus(
         State state, bool wasSeenInJIT, const StructureSet& structureSet = StructureSet(),
-        PropertyOffset offset = invalidOffset, JSValue specificValue = JSValue(), PassRefPtr<IntendedStructureChain> chain = nullptr)
+        PropertyOffset offset = invalidOffset, JSValue specificValue = JSValue(), PassRefPtr<IntendedStructureChain> chain = 0)
         : m_state(state)
         , m_structureSet(structureSet)
         , m_chain(chain)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to