webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 19 insertions, 6 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp b/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp
index 0cfa00f6f..4b82b031d 100644
--- a/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,17 +24,17 @@
  */
 
 #include "config.h"
+#include "DFGDesiredTransitions.h"
 
 #if ENABLE(DFG_JIT)
 
-#include "DFGDesiredTransitions.h"
-
 #include "CodeBlock.h"
 #include "DFGCommonData.h"
+#include "JSCInlines.h"
 
 namespace JSC { namespace DFG {
 
-DesiredTransition::DesiredTransition(CodeBlock* codeBlock, ScriptExecutable* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
+DesiredTransition::DesiredTransition(CodeBlock* codeBlock, CodeBlock* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
     : m_codeBlock(codeBlock)
     , m_codeOriginOwner(codeOriginOwner)
     , m_oldStructure(oldStructure)
@@ -46,11 +46,18 @@ void DesiredTransition::reallyAdd(VM& vm, CommonData* common)
 {
     common->transitions.append(
         WeakReferenceTransition(
-            vm, m_codeBlock->ownerExecutable(),
+            vm, m_codeBlock,
             m_codeOriginOwner,
             m_oldStructure, m_newStructure));
 }
 
+void DesiredTransition::visitChildren(SlotVisitor& visitor)
+{
+    visitor.appendUnbarriered(m_codeOriginOwner);
+    visitor.appendUnbarriered(m_oldStructure);
+    visitor.appendUnbarriered(m_newStructure);
+}
+
 DesiredTransitions::DesiredTransitions()
 {
 }
@@ -59,7 +66,7 @@ DesiredTransitions::~DesiredTransitions()
 {
 }
 
-void DesiredTransitions::addLazily(CodeBlock* codeBlock, ScriptExecutable* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
+void DesiredTransitions::addLazily(CodeBlock* codeBlock, CodeBlock* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
 {
     m_transitions.append(DesiredTransition(codeBlock, codeOriginOwner, oldStructure, newStructure));
 }
@@ -70,6 +77,12 @@ void DesiredTransitions::reallyAdd(VM& vm, CommonData* common)
         m_transitions[i].reallyAdd(vm, common);
 }
 
+void DesiredTransitions::visitChildren(SlotVisitor& visitor)
+{
+    for (unsigned i = 0; i < m_transitions.size(); i++)
+        m_transitions[i].visitChildren(visitor);
+}
+
 } } // namespace JSC::DFG
 
 #endif // ENABLE(DFG_JIT)