commit ea77149c7c8278a935ef85773190ce237b225508
author oliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jul 25 03:58:38 2013 +0000
committer oliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jul 25 03:58:38 2013 +0000
tree 19d82d30adcbb1dcb23fae960821dfeb836b5c2f
parent b39564439a88437f7deea9463ad83f40210a1580

fourthTier: Landing the initial FTL logic in a single commit to avoid spurious
broken builds.

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

Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp

diff --git a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp
index 69836c7..51fdf5a 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp
@@ -30,10 +30,11 @@
 
 #include "DFGOperations.h"
 #include "JSCJSValueInlines.h"
+#include "Operations.h"
 
 namespace JSC { namespace DFG {
 
-void handleExitCounts(CCallHelpers& jit, const OSRExit& exit)
+void handleExitCounts(CCallHelpers& jit, const OSRExitBase& exit)
 {
     jit.add32(AssemblyHelpers::TrustedImm32(1), AssemblyHelpers::AbsoluteAddress(&exit.m_count));
     
@@ -74,7 +75,7 @@
     doneAdjusting.link(&jit);
 }
 
-void reifyInlinedCallFrames(CCallHelpers& jit, const OSRExit& exit)
+void reifyInlinedCallFrames(CCallHelpers& jit, const OSRExitBase& exit)
 {
 #if USE(JSVALUE64)
     ASSERT(jit.baselineCodeBlock()->getJITType() == JITCode::BaselineJIT);
@@ -148,7 +149,7 @@
 #endif // USE(JSVALUE64) // ending the #else part, so directly above is the 32-bit part
 }
 
-void adjustAndJumpToTarget(CCallHelpers& jit, const OSRExit& exit)
+void adjustAndJumpToTarget(CCallHelpers& jit, const OSRExitBase& exit)
 {
     if (exit.m_codeOrigin.inlineCallFrame)
         jit.addPtr(AssemblyHelpers::TrustedImm32(exit.m_codeOrigin.inlineCallFrame->stackOffset * sizeof(EncodedJSValue)), GPRInfo::callFrameRegister);