webkitgtk-2.12.3webkitgtk-2.12.3

1 files changed, 6 insertions, 9 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp b/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp
index 98e58a101..ba2a0da11 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
 #include "Executable.h"
 #include "JIT.h"
 #include "JITCode.h"
-#include "Operations.h"
+#include "JSCInlines.h"
 
 namespace JSC { namespace DFG {
 
@@ -41,17 +41,14 @@ void prepareCodeOriginForOSRExit(ExecState* exec, CodeOrigin codeOrigin)
     VM& vm = exec->vm();
     DeferGC deferGC(vm.heap);
     
-    for (; codeOrigin.inlineCallFrame; codeOrigin = codeOrigin.inlineCallFrame->caller) {
-        FunctionExecutable* executable =
-            static_cast<FunctionExecutable*>(codeOrigin.inlineCallFrame->executable.get());
-        CodeBlock* codeBlock = executable->baselineCodeBlockFor(
-            codeOrigin.inlineCallFrame->isCall ? CodeForCall : CodeForConstruct);
-        
+    for (; codeOrigin.inlineCallFrame; codeOrigin = codeOrigin.inlineCallFrame->directCaller) {
+        CodeBlock* codeBlock = codeOrigin.inlineCallFrame->baselineCodeBlock.get();
         if (codeBlock->jitType() == JSC::JITCode::BaselineJIT)
             continue;
+
         ASSERT(codeBlock->jitType() == JSC::JITCode::InterpreterThunk);
         JIT::compile(&vm, codeBlock, JITCompilationMustSucceed);
-        codeBlock->install();
+        codeBlock->ownerScriptExecutable()->installCode(codeBlock);
     }
 }