diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:20 +0100 |
| commit | 871addbdcb8e346efb86268443b99ec7d03fedf5 (patch) | |
| tree | 535da475f6c01223cb468d4c7f3497303626cbcf /src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h | |
| parent | 9520f82e00f26d7d217f7d2777ba2f3cd958d012 (diff) | |
| parent | 8cc5a741d016d49952d4eb15dac57cc34c1e2344 (diff) | |
| download | qtscript-871addbdcb8e346efb86268443b99ec7d03fedf5.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ie63ca45ad8e2c57ad27c7b693f268ce5c4cc18f4
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h index 7571efc..a8deb5e 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h @@ -316,8 +316,10 @@ namespace JSC { Structure* existingTransition = singleTransition(); TransitionTable* transitionTable = new TransitionTable; setTransitionTable(transitionTable); - if (existingTransition) - add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), existingTransition, existingTransition->m_specificValueInPrevious); + if (existingTransition) { + const unsigned attrsInPrev = existingTransition->m_attributesInPrevious; + add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), attrsInPrev), existingTransition, existingTransition->m_specificValueInPrevious); + } } } // namespace JSC |