From 815f1ed417bd26fbe2abbdf20ac5d3423b30796c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 23 Jul 2012 09:28:44 +0200
Subject: Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92
 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests
---
 Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp | 43 +++++++++++++++++--------
 1 file changed, 30 insertions(+), 13 deletions(-)

(limited to 'Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp')

diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
index 1b1395934..e4e94e90b 100644
--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
@@ -2271,7 +2271,6 @@ bool ByteCodeParser::parseBlock(unsigned limit)
                 m_graph.m_storageAccessData.append(storageAccessData);
             } else if (!hasExitSite
                        && putByIdStatus.isSimpleTransition()
-                       && putByIdStatus.oldStructure()->outOfLineCapacity() == putByIdStatus.newStructure()->outOfLineCapacity()
                        && structureChainIsStillValid(
                            direct,
                            putByIdStatus.oldStructure(),
@@ -2293,20 +2292,38 @@ bool ByteCodeParser::parseBlock(unsigned limit)
                     }
                 }
                 ASSERT(putByIdStatus.oldStructure()->transitionWatchpointSetHasBeenInvalidated());
-                addToGraph(
-                    PutStructure,
-                    OpInfo(
-                        m_graph.addStructureTransitionData(
-                            StructureTransitionData(
-                                putByIdStatus.oldStructure(),
-                                putByIdStatus.newStructure()))),
-                    base);
                 
                 NodeIndex propertyStorage;
-                if (isInlineOffset(putByIdStatus.offset()))
-                    propertyStorage = base;
-                else
-                    propertyStorage = addToGraph(GetPropertyStorage, base);
+                StructureTransitionData* transitionData =
+                    m_graph.addStructureTransitionData(
+                        StructureTransitionData(
+                            putByIdStatus.oldStructure(),
+                            putByIdStatus.newStructure()));
+
+                if (putByIdStatus.oldStructure()->outOfLineCapacity()
+                    != putByIdStatus.newStructure()->outOfLineCapacity()) {
+                    
+                    // If we're growing the property storage then it must be because we're
+                    // storing into the out-of-line storage.
+                    ASSERT(!isInlineOffset(putByIdStatus.offset()));
+                    
+                    if (!putByIdStatus.oldStructure()->outOfLineCapacity()) {
+                        propertyStorage = addToGraph(
+                            AllocatePropertyStorage, OpInfo(transitionData), base);
+                    } else {
+                        propertyStorage = addToGraph(
+                            ReallocatePropertyStorage, OpInfo(transitionData),
+                            base, addToGraph(GetPropertyStorage, base));
+                    }
+                } else {
+                    if (isInlineOffset(putByIdStatus.offset()))
+                        propertyStorage = base;
+                    else
+                        propertyStorage = addToGraph(GetPropertyStorage, base);
+                }
+                
+                addToGraph(PutStructure, OpInfo(transitionData), base);
+                
                 addToGraph(
                     PutByOffset,
                     OpInfo(m_graph.m_storageAccessData.size()),
-- 
cgit v1.2.1