@@ -88,7 +88,7 @@ void CallLinkInfo::clearStub()
     if (!stub())
         return;
 
-    m_stub->clearCallNodesFor(this);
+    m_stub->unlinkForcefully();
     m_stub = nullptr;
 }
 
 
@@ -55,9 +55,11 @@ void PolymorphicCallNode::unlinkOrUpgradeImpl(VM& vm, CodeBlock* oldCodeBlock, C
     }
 }
 
-void PolymorphicCallNode::clear()
+void PolymorphicCallNode::unlinkForcefully()
 {
     m_cleared = true;
+    if (isOnList())
+        remove();
 }
 
 PolymorphicCallStubRoutine* PolymorphicCallNode::owner()
@@ -150,10 +152,10 @@ CallEdgeList PolymorphicCallStubRoutine::edges() const
     return result;
 }
 
-void PolymorphicCallStubRoutine::clearCallNodesFor(CallLinkInfo*)
+void PolymorphicCallStubRoutine::unlinkForcefully()
 {
     for (auto& callNode : leadingSpan())
-        callNode.clear();
+        callNode.unlinkForcefully();
 }
 
 bool PolymorphicCallStubRoutine::visitWeakImpl(VM& vm)
 
@@ -55,7 +55,7 @@ class PolymorphicCallNode final : public CallLinkInfoBase {
 
     void unlinkOrUpgradeImpl(VM&, CodeBlock*, CodeBlock*);
 
-    void clear();
+    void unlinkForcefully();
 
     PolymorphicCallStubRoutine* owner();
 
@@ -94,7 +94,7 @@ class PolymorphicCallStubRoutine final : public GCAwareJITStubRoutine, public Bu
     bool hasEdges() const;
     CallEdgeList edges() const;
 
-    void clearCallNodesFor(CallLinkInfo*);
+    void unlinkForcefully();
 
     template<typename Functor>
     void forEachDependentCell(const Functor& functor) const
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void CallLinkInfo::clearStub()`
`88`	`88`	`if (!stub())`
`89`	`89`	`return;`
`90`	`90`
`91`		`- m_stub->clearCallNodesFor(this);`
	`91`	`+ m_stub->unlinkForcefully();`
`92`	`92`	`m_stub = nullptr;`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,11 @@ void PolymorphicCallNode::unlinkOrUpgradeImpl(VM& vm, CodeBlock* oldCodeBlock, C`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-void PolymorphicCallNode::clear()`
	`58`	`+void PolymorphicCallNode::unlinkForcefully()`
`59`	`59`	`{`
`60`	`60`	`m_cleared = true;`
	`61`	`+ if (isOnList())`
	`62`	`+ remove();`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`PolymorphicCallStubRoutine* PolymorphicCallNode::owner()`
`@@ -150,10 +152,10 @@ CallEdgeList PolymorphicCallStubRoutine::edges() const`
`150`	`152`	`return result;`
`151`	`153`	`}`
`152`	`154`
`153`		`-void PolymorphicCallStubRoutine::clearCallNodesFor(CallLinkInfo*)`
	`155`	`+void PolymorphicCallStubRoutine::unlinkForcefully()`
`154`	`156`	`{`
`155`	`157`	`for (auto& callNode : leadingSpan())`
`156`		`- callNode.clear();`
	`158`	`+ callNode.unlinkForcefully();`
`157`	`159`	`}`
`158`	`160`
`159`	`161`	`bool PolymorphicCallStubRoutine::visitWeakImpl(VM& vm)`