Changeset 177401 in webkit for trunk/Source/JavaScriptCore/jit/Repatch.cpp

Timestamp:

Dec 16, 2014, 3:08:24 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r177380.
​https://bugs.webkit.org/show_bug.cgi?id=139707

"Breaks js/regres/elidable-new-object-* tests" (Requested by
msaboff_ on #webkit).

Reverted changeset:

"Fixes operationPutByIdOptimizes such that they check that the
put didn't"
​https://bugs.webkit.org/show_bug.cgi?id=139500
​http://trac.webkit.org/changeset/177380

File:

• trunk/Source/JavaScriptCore/jit/Repatch.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/jit/Repatch.cpp

@@ -1225 +1225 @@
 }
 
-static InlineCacheAction tryCachePutByID(ExecState* exec, JSValue baseValue, Structure* structure, const Identifier& ident, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
+static InlineCacheAction tryCachePutByID(ExecState* exec, JSValue baseValue, const Identifier& ident, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
 {
     if (Options::forceICFailure())
@@ -1236 +1236 @@
         return GiveUpOnCache;
     JSCell* baseCell = baseValue.asCell();
-    
-    if (baseCell->structure(*vm)->id() != structure->id())
-        return GiveUpOnCache;
-
+    Structure* structure = baseCell->structure(*vm);
     Structure* oldStructure = structure->previousID();
     
@@ -1337 +1334 @@
 }
 
-void repatchPutByID(ExecState* exec, JSValue baseValue, Structure* structure, const Identifier& propertyName, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
+void repatchPutByID(ExecState* exec, JSValue baseValue, const Identifier& propertyName, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
 {
     GCSafeConcurrentJITLocker locker(exec->codeBlock()->m_lock, exec->vm().heap);
     
-    if (tryCachePutByID(exec, baseValue, structure, propertyName, slot, stubInfo, putKind) == GiveUpOnCache)
+    if (tryCachePutByID(exec, baseValue, propertyName, slot, stubInfo, putKind) == GiveUpOnCache)
         repatchCall(exec->codeBlock(), stubInfo.callReturnLocation, appropriateGenericPutByIdFunction(slot, putKind));
 }