JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / dfg / DFGOSRExit.cpp

diff --git a/dfg/DFGOSRExit.cpp b/dfg/DFGOSRExit.cpp
index ac085ec06c1e0d235593015e502052df254f7f00..8b4d67ace08ae9837a1e6469434d87a39655f931 100644 (file)
--- a/dfg/DFGOSRExit.cpp
+++ b/dfg/DFGOSRExit.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -28,24 +28,20 @@
 
 #if ENABLE(DFG_JIT)
 
 
 #if ENABLE(DFG_JIT)
 

-#include "DFGAssemblyHelpers.h"
+#include "AssemblyHelpers.h"
+#include "DFGGraph.h"

 #include "DFGSpeculativeJIT.h"
 #include "DFGSpeculativeJIT.h"

-#include "JSCellInlines.h"
+#include "JSCInlines.h"

 
 namespace JSC { namespace DFG {
 
 OSRExit::OSRExit(ExitKind kind, JSValueSource jsValueSource, MethodOfGettingAValueProfile valueProfile, SpeculativeJIT* jit, unsigned streamIndex, unsigned recoveryIndex)
 
 namespace JSC { namespace DFG {
 
 OSRExit::OSRExit(ExitKind kind, JSValueSource jsValueSource, MethodOfGettingAValueProfile valueProfile, SpeculativeJIT* jit, unsigned streamIndex, unsigned recoveryIndex)

-    : m_jsValueSource(jsValueSource)
+    : OSRExitBase(kind, jit->m_codeOriginForExitTarget, jit->m_codeOriginForExitProfile)
+    , m_jsValueSource(jsValueSource)

     , m_valueProfile(valueProfile)
     , m_patchableCodeOffset(0)
     , m_valueProfile(valueProfile)
     , m_patchableCodeOffset(0)

-    , m_codeOrigin(jit->m_codeOriginForOSR)
-    , m_codeOriginForExitProfile(m_codeOrigin)

     , m_recoveryIndex(recoveryIndex)
     , m_recoveryIndex(recoveryIndex)

-    , m_watchpointIndex(std::numeric_limits<unsigned>::max())
-    , m_kind(kind)
-    , m_count(0)

     , m_streamIndex(streamIndex)
     , m_streamIndex(streamIndex)

-    , m_lastSetOperand(jit->m_lastSetOperand)

 {
     ASSERT(m_codeOrigin.isSet());
 }
 {
     ASSERT(m_codeOrigin.isSet());
 }


@@ -62,7 +58,7 @@ MacroAssembler::Jump OSRExit::getPatchableCodeOffsetAsJump() const
 
 CodeLocationJump OSRExit::codeLocationForRepatch(CodeBlock* dfgCodeBlock) const
 {
 
 CodeLocationJump OSRExit::codeLocationForRepatch(CodeBlock* dfgCodeBlock) const
 {

-    return CodeLocationJump(dfgCodeBlock->getJITCode().dataAddressAtOffset(m_patchableCodeOffset));
+    return CodeLocationJump(dfgCodeBlock->jitCode()->dataAddressAtOffset(m_patchableCodeOffset));

 }
 
 void OSRExit::correctJump(LinkBuffer& linkBuffer)
 }
 
 void OSRExit::correctJump(LinkBuffer& linkBuffer)


@@ -72,20 +68,6 @@ void OSRExit::correctJump(LinkBuffer& linkBuffer)
     m_patchableCodeOffset = linkBuffer.offsetOf(label);
 }
 
     m_patchableCodeOffset = linkBuffer.offsetOf(label);
 }
 

-bool OSRExit::considerAddingAsFrequentExitSiteSlow(CodeBlock* profiledCodeBlock)
-{
-    FrequentExitSite exitSite;
-    
-    if (m_kind == ArgumentsEscaped) {
-        // Count this one globally. It doesn't matter where in the code block the arguments excaped;
-        // the fact that they did is not associated with any particular instruction.
-        exitSite = FrequentExitSite(m_kind);
-    } else
-        exitSite = FrequentExitSite(m_codeOriginForExitProfile.bytecodeIndex, m_kind);
-    
-    return baselineCodeBlockForOriginAndBaselineCodeBlock(m_codeOriginForExitProfile, profiledCodeBlock)->addFrequentExitSite(exitSite);
-}
-

 } } // namespace JSC::DFG
 
 #endif // ENABLE(DFG_JIT)
 } } // namespace JSC::DFG
 
 #endif // ENABLE(DFG_JIT)