Eliot Miranda uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-eem.699.mcz
==================== Summary ====================
Name: Collections-eem.699 Author: eem Time: 23 June 2016, 4:28:17.428149 pm UUID: b82a57a1-a212-4ebe-a738-59abebf9a380 Ancestors: Collections-ul.698
Fix growth on become failure due to insufficient memory.
=============== Diff against Collections-ul.698 ===============
Item was changed: ----- Method: Array>>elementsExchangeIdentityWith: (in category 'converting') ----- elementsExchangeIdentityWith: otherArray "This primitive performs a bulk mutation, causing all pointers to the elements of the receiver to be replaced by pointers to the corresponding elements of otherArray. At the same time, all pointers to the elements of otherArray are replaced by pointers to the corresponding elements of this array. The identityHashes remain with the pointers rather than with the objects so that objects in hashed structures should still be properly indexed after the mutation."
<primitive: 128 error: ec> ec == #'bad receiver' ifTrue: [^self error: 'receiver must be of class Array']. ec == #'bad argument' ifTrue: [^self error: (otherArray class == Array ifTrue: ['arg must be of class Array'] ifFalse: ['receiver and argument must have the same size'])]. ec == #'inappropriate operation' ifTrue: [^self error: 'can''t become immediates such as SmallIntegers or Characters']. ec == #'no modification' ifTrue: [^self error: 'can''t become immutable objects']. ec == #'object is pinned' ifTrue: [^self error: 'can''t become pinned objects']. ec == #'insufficient object memory' ifTrue: + [| maxRequired | + "In Spur, two-way become may involve making each pair of objects into a forwarder into a copy of the other. + So if become fails with #'insufficient object memory', garbage collect, and if necessary, grow memory." + maxRequired := (self detectSum: [:obj | obj class byteSizeOfInstanceOfSize: obj basicSize]) + + (otherArray detectSum: [:obj | obj class byteSizeOfInstanceOfSize: obj basicSize]). + (Smalltalk garbageCollectMost < maxRequired + and: [Smalltalk garbageCollect < maxRequired]) ifTrue: + [Smalltalk growMemoryByAtLeast: maxRequired]. - [Smalltalk garbageCollect < 1048576 ifTrue: - [Smalltalk growMemoryByAtLeast: 1048576]. ^self elementsExchangeIdentityWith: otherArray]. self primitiveFailed!
Item was changed: ----- Method: Array>>elementsForwardIdentityTo: (in category 'converting') ----- elementsForwardIdentityTo: otherArray "This primitive performs a bulk mutation, causing all pointers to the elements of the receiver to be replaced by pointers to the corresponding elements of otherArray. The identityHashes remain with the pointers rather than with the objects so that the objects in this array should still be properly indexed in any existing hashed structures after the mutation." <primitive: 72 error: ec> ec == #'bad receiver' ifTrue: [^self error: 'receiver must be of class Array']. ec == #'bad argument' ifTrue: [^self error: (otherArray class == Array ifTrue: ['arg must be of class Array'] ifFalse: ['receiver and argument must have the same size'])]. ec == #'inappropriate operation' ifTrue: [^self error: 'can''t become immediates such as SmallIntegers or Characters']. ec == #'no modification' ifTrue: [^self error: 'can''t become immutable objects']. ec == #'object is pinned' ifTrue: [^self error: 'can''t become pinned objects']. ec == #'insufficient object memory' ifTrue: + [self error: 'The virtual machine is out-of-date. Please upgrade.']. - [Smalltalk garbageCollect < 1048576 ifTrue: - [Smalltalk growMemoryByAtLeast: 1048576]. - ^self elementsForwardIdentityTo: otherArray]. self primitiveFailed!