Packages March 2018

packages@lists.squeakfoundation.org

1 participants
71 discussions

The Trunk: Compiler-eem.378.mcz
by commits＠source.squeak.org 15 Mar '18

15 Mar '18

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.378.mcz ==================== Summary ==================== Name: Compiler-eem.378 Author: eem Time: 14 March 2018, 7:13:03.579626 pm UUID: 9e96b6bb-8a69-4250-9b67-e61ce104cadc Ancestors: Compiler-eem.377 Provide a full block extractor, e.g. to support InstructionStream>>blockMethodOrNil a la selectorToSendOrSelf. Fix a typo. =============== Diff against Compiler-eem.377 =============== Item was added: + ----- Method: BytecodeEncoder class>>blockMethodOrNilFor:in:at: (in category 'instruction stream support') ----- + blockMethodOrNilFor: anInstructionStream in: method at: pc + "If anInstructionStream is at a block creation bytecode then answer the block's + CompiledBlock, otherwise answer nil. + Subclasses override as appropriate." + + ^nil! Item was changed: ----- Method: BytecodeEncoder class>>createClosureCode (in category 'bytecode decoding') ----- createClosureCode + "Answer the create closure bytecode, if it exists in the encoder's bytecode set, or nil if not." - "Answer the create closure bytecode, if it exists in the encoder's byetcode set, or nil if not." ^nil! Item was added: + ----- Method: EncoderForSistaV1 class>>blockMethodOrNilFor:in:at: (in category 'instruction stream support') ----- + blockMethodOrNilFor: anInstructionStream in: method at: pc + "If anInstructionStream is at a block creation bytecode then answer the block's + CompiledBlock, otherwise answer nil. + + The complication is that for convenience we allow the pc to point to the + raw send bytecode after its extension(s), or at the extension(s) preceeding it. + 249 11111001 xxxxxxxx siyyyyyy push Closure Compiled block literal index xxxxxxxx (+ Extend A * 256) numCopied yyyyyy receiverOnStack: s = 1 ignoreOuterContext: i = 1" + + | byte | + byte := method at: pc. + byte = 249 ifTrue: + ["it could be extended..." + ^self extensionsFor: pc in: method into: + [:extA :extB :nExtBytes| + method literalAt: (method at: pc + nExtBytes + 1) + (extA bitShift: 8) + 1]]. + ^byte = 16rE0 ifTrue: + [self extensionsAt: pc in: method into: + [:extA :extB :nExtBytes| + (method at: pc + nExtBytes) = 249 ifTrue: + [method literalAt: (method at: pc + nExtBytes + 1) + (extA bitShift: 8) + 1]]]!

1 0

The Trunk: Morphic-eem.1400.mcz
by commits＠source.squeak.org 15 Mar '18

15 Mar '18

Eliot Miranda uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-eem.1400.mcz ==================== Summary ==================== Name: Morphic-eem.1400 Author: eem Time: 14 March 2018, 7:10:14.547591 pm UUID: d4a50144-3d70-4ec6-95d4-5be59d2c0fbb Ancestors: Morphic-mt.1399 Senders of userString such as Morph>>allStringsAfter: allow for the possibility of userString being nil. Indeed click on the background during new release image configuration and this will occur. So make TextMorph>>userString answer nil if it has no text as yet. =============== Diff against Morphic-mt.1399 =============== Item was changed: ----- Method: TextMorph>>userString (in category 'accessing') ----- userString "Do I have a text string to be searched on?" + ^text ifNotNil: [:txt| txt string]! - ^ text string!

1 0

The Trunk: KernelTests-eem.335.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-eem.335.mcz ==================== Summary ==================== Name: KernelTests-eem.335 Author: eem Time: 14 March 2018, 3:39:26.80156 pm UUID: f9d625c9-3103-46da-b5a4-5a4119c5bd29 Ancestors: KernelTests-eem.334 Have the literal location tests also check references in blocks. =============== Diff against KernelTests-eem.334 =============== Item was changed: ----- Method: LiteralRefLocatorTest>>testFindLiteralsInBytecode (in category 'tests') ----- testFindLiteralsInBytecode "Create a method referencing integers, characters, special selectors and nil, true & false. Compile it and check that the objects are found." | source primary secondary binarySpecials integers characters | binarySpecials := Smalltalk specialSelectors select: [:s| s isSymbol and: [s isBinary]]. "-65536 to 65535 in powers of two" integers := ((16 to: 1 by: -1) collect: [:power| (2 raisedTo: power) negated]), ((0 to: 16) collect: [:power| (2 raisedTo: power) - 1]). "some printable characters; alas none have code > 255" characters := (0 to: 65535) select: [:n| (n between: 132 and: 160) not "these have no glyph in typical fonts" and: [(Character value: n) shouldBePrintedAsLiteral]] thenCollect: [:n| Character value: n]. [characters size > 32] whileTrue: [characters := (1 to: characters size by: 2) collect: [:i| characters at: i]]. + + #(('' '') ('^[' ']')) do: "And the locators should work whether in a block or not" + [:pFixes| + source := ByteString streamContents: + [:s| | binaries | + binaries := binarySpecials readStream. + s nextPutAll: 'exampleMethod'; crtab; nextPutAll: pFixes first. + integers + do: [:n| s print: n] + separatedBy: + [binaries atEnd ifTrue: [binaries reset]. + s space; nextPutAll: binaries next; space]. + s nextPut: $.; crtab. + s nextPut: ${; space. + characters + do: [:c| s print: c] + separatedBy: [s nextPut: $.; space]. + s space; nextPut: $}; nextPut: $.; crtab. + s nextPutAll: 'true ifTrue: [^nil] ifFalse: [^false]'; nextPutAll: pFixes last]. + primary := CompiledCode classPool at: #PrimaryBytecodeSetEncoderClass. + secondary := CompiledCode classPool at: #SecondaryBytecodeSetEncoderClass. + { primary. secondary } do: + [:encoderClass| | method | + method := (Parser new + encoderClass: encoderClass; + parse: source class: self class) + generate: CompiledMethodTrailer empty. - source := ByteString streamContents: - [:s| | binaries | - binaries := binarySpecials readStream. - s nextPutAll: 'exampleMethod'; crtab. - integers - do: [:n| s print: n] - separatedBy: - [binaries atEnd ifTrue: [binaries reset]. - s space; nextPutAll: binaries next; space]. - s nextPut: $.; crtab. - s nextPut: ${; space. - characters - do: [:c| s print: c] - separatedBy: [s nextPut: $.; space]. - s space; nextPut: $}; nextPut: $.; crtab. - s nextPutAll: 'true ifTrue: [^nil] ifFalse: [^false]']. - primary := CompiledCode classPool at: #PrimaryBytecodeSetEncoderClass. - secondary := CompiledCode classPool at: #SecondaryBytecodeSetEncoderClass. - { primary. secondary } do: - [:encoderClass| | method | - method := (Parser new - encoderClass: encoderClass; - parse: source class: self class) - generate: CompiledMethodTrailer empty. - binarySpecials, integers, characters, #(nil false true) do: - [:literal| - self assert: (method - refersTo: literal - primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) - secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) - thorough: false). - (encoderClass scanBlockOrNilForLiteral: literal) - ifNil: [self assert: (method hasLiteral: literal)] - ifNotNil: [:scanBlock| self assert: (method scanFor: scanBlock)]]. - - "Now test for false positives..." - integers, characters, #(nil false true) do: - [:literal| | simpleSource simpleMethod | - simpleSource := ByteString streamContents: - [:s| s nextPutAll: 'exampleMethod'; crtab; print: literal; nextPutAll: ' class']. - simpleMethod := (Parser new - encoderClass: encoderClass; - parse: simpleSource class: self class) - generate: CompiledMethodTrailer empty. binarySpecials, integers, characters, #(nil false true) do: + [:literal| + self assert: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: false). + (encoderClass scanBlockOrNilForLiteral: literal) + ifNil: [self assert: (method hasLiteral: literal)] + ifNotNil: [:scanBlock| + self assert: ((method scanFor: scanBlock) + or: [method literals anySatisfy: [:l| l isCompiledCode and: [l scanFor: scanBlock]]])]]. + + "Now test for false positives..." + integers, characters, #(nil false true) do: + [:literal| | simpleSource simpleMethod | + simpleSource := ByteString streamContents: + [:s| s nextPutAll: 'exampleMethod'; crtab; nextPutAll: pFixes first; print: literal; nextPutAll: ' class'; nextPutAll: pFixes last]. + simpleMethod := (Parser new + encoderClass: encoderClass; + parse: simpleSource class: self class) + generate: CompiledMethodTrailer empty. + binarySpecials, integers, characters, #(nil false true) do: + [:anyLiteral| + anyLiteral == literal + ifTrue: + [self assert: (simpleMethod + refersTo: anyLiteral + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral) + thorough: false). + (encoderClass scanBlockOrNilForLiteral: anyLiteral) + ifNil: [self assert: (simpleMethod hasLiteral: anyLiteral)] + ifNotNil: [:scanBlock| + self assert: ((simpleMethod scanFor: scanBlock) + or: [simpleMethod literals anySatisfy: [:l| l isCompiledCode and: [l scanFor: scanBlock]]])]] + ifFalse: + [self deny: (simpleMethod + refersTo: anyLiteral + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral) + thorough: false). + (encoderClass scanBlockOrNilForLiteral: anyLiteral) + ifNil: [self deny: (simpleMethod hasLiteral: anyLiteral)] + ifNotNil: [:scanBlock| + self deny: ((simpleMethod scanFor: scanBlock) + or: [simpleMethod literals anySatisfy: [:l| l isCompiledCode and: [l scanFor: scanBlock]]])]]]]]]! - [:anyLiteral| - anyLiteral == literal - ifTrue: - [self assert: (simpleMethod - refersTo: anyLiteral - primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral) - secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral) - thorough: false). - (encoderClass scanBlockOrNilForLiteral: anyLiteral) - ifNil: [self assert: (simpleMethod hasLiteral: anyLiteral)] - ifNotNil: [:scanBlock| self assert: (simpleMethod scanFor: scanBlock)]] - ifFalse: - [self deny: (simpleMethod - refersTo: anyLiteral - primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral) - secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral) - thorough: false). - (encoderClass scanBlockOrNilForLiteral: anyLiteral) - ifNil: [self deny: (simpleMethod hasLiteral: anyLiteral)] - ifNotNil: [:scanBlock| self deny: (simpleMethod scanFor: scanBlock)]]]]]! Item was changed: ----- Method: LiteralRefLocatorTest>>testThoroughFindLiteralsInBytecode (in category 'tests') ----- testThoroughFindLiteralsInBytecode "Create a method referencing integers, characters, special selectors and nil, true & false. Compile it and check that the objects are found." | literals problem primary secondary | literals := #(-1 0 1 $0 $1 1.0 #[1 2 3 4] 'one' #one nil true false NaN). problem := Float bindingOf: #NaN. primary := CompiledCode classPool at: #PrimaryBytecodeSetEncoderClass. secondary := CompiledCode classPool at: #SecondaryBytecodeSetEncoderClass. { primary. secondary } do: [:encoderClass| | method | + #(('' '') ('^[' ']')) do: "And the locators should work whether in a block or not" + [:pFixes| + "NaN's binding should still be found even though (Float bindingOf: #NaN) ~= (Float bindingOf: #NaN)" + method := (Parser new + encoderClass: encoderClass; + parse: 'foo ', pFixes first, '^NaN', pFixes last class: Float) + generate: CompiledMethodTrailer empty. - "NaN's binding should still be found even though (Float bindingOf: #NaN) ~= (Float bindingOf: #NaN)" - method := (Parser new - encoderClass: encoderClass; - parse: 'foo ^NaN' class: Float) - generate: CompiledMethodTrailer empty. - [:literal| - self assert: (method - refersTo: literal - primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) - secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) - thorough: false). - self assert: (method - refersTo: literal - primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) - secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) - thorough: true)] value: problem. - - "All the literals should be found in a thorough search, but not otherwise" - method := (Parser new - encoderClass: encoderClass; - parse: 'foo ^', literals storeString class: Float) - generate: CompiledMethodTrailer empty. - literals, {problem. problem key} do: [:literal| + self assert: (method - self deny: (method refersTo: literal primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) thorough: false). + self assert: (method - self assert: (method refersTo: literal primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: true)] value: problem. - thorough: true)]. + "All the literals should be found in a thorough search, but not otherwise" + method := (Parser new + encoderClass: encoderClass; + parse: 'foo ', pFixes first, '^', literals storeString, pFixes last class: Float) + generate: CompiledMethodTrailer empty. + literals, {problem. problem key} do: + [:literal| + self deny: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: false). + self assert: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: true)]]. + "Likewise if in a pragma" method := (Parser new encoderClass: encoderClass; parse: 'foo <pragma: ', literals storeString, ' with: ', problem key storeString, '>' class: Float) generate: CompiledMethodTrailer empty. literals, {problem. problem key} do: [:literal| self deny: (method refersTo: literal primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) thorough: false). self assert: (method refersTo: literal primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) thorough: true)]]!

1 0

The Trunk: Compiler-eem.377.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.377.mcz ==================== Summary ==================== Name: Compiler-eem.377 Author: eem Time: 14 March 2018, 3:38:12.426121 pm UUID: e69687e2-f183-40f0-abed-f080749ea44e Ancestors: Compiler-eem.376 Fix compiler bug with full blocks. Old code added an extra literal nil. =============== Diff against Compiler-eem.376 =============== Item was added: + ----- Method: BytecodeEncoder>>allLiteralsForBlockMethod (in category 'results') ----- + allLiteralsForBlockMethod + "N.B. addedSelectorAndMethodClassLiterals is a misnomer. It should be something like + addedImplicitLiterals or addedExtraLiterals." + addedSelectorAndMethodClassLiterals ifFalse: + [addedSelectorAndMethodClassLiterals := true. + "Put the optimized selectors in literals so as to browse senders more easily" + optimizedSelectors := optimizedSelectors reject: [:e| literalStream originalContents hasLiteral: e]. + optimizedSelectors isEmpty ifFalse: [ + "Use one entry per literal if enough room, else make anArray" + literalStream position + optimizedSelectors size + 2 >= self maxNumLiterals + ifTrue: [self litIndex: optimizedSelectors asArray] + ifFalse: [optimizedSelectors do: [:e | self litIndex: e]]]. + "Add a slot for outerCode" + self litIndex: nil]. + ^literalStream contents! Item was changed: ----- Method: BytecodeEncoder>>generateBlockMethodOfClass:trailer:from: (in category 'method encoding') ----- generateBlockMethodOfClass: aCompiledBlockClass trailer: trailer from: blockNode "Generate a CompiledBlock for the block whose parse tree is blockNode." "The closure analysis should already have been done." | blkSize header literals locals method nLits stack | self assert: blockNode blockExtent notNil. self assert: rootNode notNil. blkSize := blockNode sizeCodeForEvaluatedFullClosureValue: self. locals := blockNode localsNodes. self noteBlockExtent: blockNode blockExtent hasLocals: locals. header := self computeMethodHeaderForNumArgs: blockNode arguments size numTemps: locals size + numLits: (nLits := (literals := self allLiteralsForBlockMethod) size) - numLits: (nLits := (literals := self allLiterals) size) primitive: 0. method := trailer createMethod: blkSize class: aCompiledBlockClass header: header. 1 to: nLits do: [:lit | (method literalAt: lit put: (literals at: lit)) isCompiledCode ifTrue: [(literals at: lit) outerCode: method]]. self streamToMethod: method. stack := ParseStack new init. stack position: method numTemps. blockMethod := method. "For BytecodeEncoder>>pc & BytecodeEncoder>>nextPC" [blockNode emitCodeForEvaluatedFullClosureValue: stack encoder: self] on: Error "If an attempt is made to write too much code the method will be asked" do: [:ex| "to grow, and the grow attempt will fail in CompiledCode class>>#newMethodViaNewError" ex signalerContext sender method = (CompiledCode class>>#newMethodViaNewError) ifTrue: [^self error: 'Compiler code size discrepancy'] ifFalse: [ex pass]]. stack position ~= (method numTemps + 1) ifTrue: [^self error: 'Compiler stack discrepancy']. stream position ~= (method size - trailer size) ifTrue: [^self error: 'Compiler code size discrepancy']. method needsFrameSize: stack size - method numTemps. ^method!

1 0

The Trunk: System-eem.1006.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-eem.1006.mcz ==================== Summary ==================== Name: System-eem.1006 Author: eem Time: 14 March 2018, 1:42:43.001695 pm UUID: ed1f0de6-02eb-494d-8d50-3f65cd70bdaa Ancestors: System-eem.1005 Have MethodReference>>compiledMethod answer nil when the method is no longer present, instead of throwing an error. Use this to make SystemNavigation>>allCallsOn:fromMethodReferences:sorted: more robust. =============== Diff against System-eem.1005 =============== Item was changed: ----- Method: MethodReference>>compiledMethod (in category 'accessing') ----- compiledMethod + ^self actualClass compiledMethodAt: methodSymbol ifAbsent: nil! - ^ self actualClass compiledMethodAt: methodSymbol! Item was changed: ----- Method: SystemNavigation>>allCallsOn:fromMethodReferences:sorted: (in category 'query') ----- allCallsOn: aLiteral fromMethodReferences: methodReferences sorted: sorted "Answer a collection of all the methods implemented by behaviors that call on aLiteral even deeply embedded in literal arrays." | result | result := CompiledCode scanBlocksForLiteral: aLiteral do: [:primaryScanner :secondaryScanner | | thorough | "Possibly search for literals embedded in literal arrays or pragmas, etc." thorough := self class thoroughSenders. methodReferences select: [ :reference | reference compiledMethod + ifNil: [false] + ifNotNil: + [:method| + method + refersTo: aLiteral + primaryBytecodeScanner: primaryScanner + secondaryBytecodeScanner: secondaryScanner + thorough: thorough]]]. - refersTo: aLiteral - primaryBytecodeScanner: primaryScanner - secondaryBytecodeScanner: secondaryScanner - thorough: thorough]]. sorted ifTrue: [result sort]. ^result!

1 0

The Trunk: Tools-eem.800.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-eem.800.mcz ==================== Summary ==================== Name: Tools-eem.800 Author: eem Time: 14 March 2018, 1:26:31.899555 pm UUID: ef0a6927-db4f-4904-8604-9b23c32852f1 Ancestors: Tools-topa.799 Make local senders of... meaningful in MessageSets (e.g. Recent Submissions) when no method is selected, so that one can filter within a list browser. =============== Diff against Tools-topa.799 =============== Item was added: + ----- Method: MessageSet>>browseLocalSendersOfMessages (in category 'message functions') ----- + browseLocalSendersOfMessages + "Override so that if no method is selected it searches for senders local to the current list." + + self selectedClass ifNotNil: + [^super browseLocalSendersOfMessages]. + + self getSelectorAndSendQuery: #value:value: + to: [:literal :label| + self systemNavigation browseAllCallsOn: literal fromMethodReferences: messageList labelled: label] + with: { 'messages' }!

1 0

The Trunk: System-eem.1005.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-eem.1005.mcz ==================== Summary ==================== Name: System-eem.1005 Author: eem Time: 14 March 2018, 1:23:08.798781 pm UUID: 57fc42cd-8d6b-477b-a7c7-1b79908da696 Ancestors: System-eem.1004 Provide SystemNavigation>>[browse]AllCallsOn:fromMethodReferences:labelled: and use it to fix a regression in allCallsOn:localToPackage:, which neglected to look at package extensions. Update allCallsOn:fromBehaviors:sorted: to use the new multiple bytecode set aware scanning machinery. =============== Diff against System-eem.1004 =============== Item was removed: - ----- Method: SmalltalkImage>>hasSpecialSelector:ifTrueSetByte: (in category 'special objects') ----- - hasSpecialSelector: aLiteral ifTrueSetByte: aBlock - - 1 to: self specialSelectorSize do: - [:index | - (self specialSelectorAt: index) == aLiteral - ifTrue: [aBlock value: index + 16rAF. ^true]]. - ^false! Item was changed: ----- Method: SystemNavigation>>allCallsOn:fromBehaviors:sorted: (in category 'query') ----- allCallsOn: aLiteral fromBehaviors: behaviors sorted: sorted + "Answer a collection of all the methods implemented by behaviors that call on aLiteral even deeply embedded in literal arrays." - "Answer a collection of all the methods implemented by behaviors that call on aLiteral even deeply embedded in literal array." + | result | - | result special thorough byte | result := OrderedCollection new. + CompiledCode + scanBlocksForLiteral: aLiteral + do: [:primaryScanner :secondaryScanner | | thorough | + "Possibly search for literals embedded in literal arrays or pragmas, etc." + thorough := self class thoroughSenders. + behaviors do: + [ :behavior | + behavior selectorsAndMethodsDo: + [ :selector :method | + (method + refersTo: aLiteral + primaryBytecodeScanner: primaryScanner + secondaryBytecodeScanner: secondaryScanner + thorough: thorough) ifTrue: + [result addLast: (MethodReference class: behavior selector: selector)]]]]. + sorted ifTrue: + [result sort]. - special := Smalltalk hasSpecialSelector: aLiteral ifTrueSetByte: [ :b | byte := b ]. - "Possibly search for symbols imbedded in literal arrays" - thorough := aLiteral isSymbol and: [ self class thoroughSenders ]. - behaviors do: [ :behavior | - | list | - list := behavior whichSelectorsReferTo: aLiteral special: special byte: byte thorough: thorough. - list do: [ :selector | - result add: (MethodReference class: behavior selector: selector) ] ]. - sorted ifTrue: [ result sort ]. ^result! Item was added: + ----- Method: SystemNavigation>>allCallsOn:fromMethodReferences:sorted: (in category 'query') ----- + allCallsOn: aLiteral fromMethodReferences: methodReferences sorted: sorted + "Answer a collection of all the methods implemented by behaviors that call on aLiteral even deeply embedded in literal arrays." + + | result | + result := CompiledCode + scanBlocksForLiteral: aLiteral + do: [:primaryScanner :secondaryScanner | | thorough | + "Possibly search for literals embedded in literal arrays or pragmas, etc." + thorough := self class thoroughSenders. + methodReferences select: + [ :reference | + reference compiledMethod + refersTo: aLiteral + primaryBytecodeScanner: primaryScanner + secondaryBytecodeScanner: secondaryScanner + thorough: thorough]]. + sorted ifTrue: + [result sort]. + ^result! Item was changed: ----- Method: SystemNavigation>>allCallsOn:localToPackage: (in category 'query') ----- allCallsOn: aLiteral localToPackage: packageNameOrInfo "Answer a sorted collection of MethodReferences for all the methods that call on aLiteral in the given package." + | result | + result := self + allCallsOn: aLiteral + fromBehaviors: (self packageInfoFor: packageNameOrInfo) classesAndMetaClasses + sorted: false. + result := result, (self + allCallsOn: aLiteral + fromMethodReferences: (self packageInfoFor: packageNameOrInfo) extensionMethods + sorted: false). + ^result sort! - ^self - allCallsOn: aLiteral - fromBehaviors: (self packageInfoFor: packageNameOrInfo) classesAndMetaClasses - sorted: true! Item was added: + ----- Method: SystemNavigation>>browseAllCallsOn:fromMethodReferences:labelled: (in category 'browse') ----- + browseAllCallsOn: aLiteral fromMethodReferences: methodReferences labelled: sourceLabel + "Create and schedule a Message Set browser for all the methods that call on aLiteral within methodReferences." + + ^self + headingAndAutoselectForLiteral: aLiteral + do: [ :label :autoSelect | + self + browseMessageList: [self allCallsOn: aLiteral + fromMethodReferences: methodReferences + sorted: true] + name: label, ' from ', sourceLabel + autoSelect: autoSelect]!

1 0

The Trunk: KernelTests-eem.334.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-eem.334.mcz ==================== Summary ==================== Name: KernelTests-eem.334 Author: eem Time: 14 March 2018, 1:20:00.017816 pm UUID: a9042bb4-a861-4b3e-9a42-6c031657b65a Ancestors: KernelTests-tonyg.333 Tests for literal finding using the new multiple bytecode set aware machinery. =============== Diff against KernelTests-tonyg.333 =============== Item was added: + TestCase subclass: #LiteralRefLocatorTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'KernelTests-Methods'! Item was added: + ----- Method: LiteralRefLocatorTest>>testFindLiteralsInBytecode (in category 'tests') ----- + testFindLiteralsInBytecode + "Create a method referencing integers, characters, special selectors and nil, true & false. + Compile it and check that the objects are found." + | source primary secondary binarySpecials integers characters | + binarySpecials := Smalltalk specialSelectors select: [:s| s isSymbol and: [s isBinary]]. + "-65536 to 65535 in powers of two" + integers := ((16 to: 1 by: -1) collect: [:power| (2 raisedTo: power) negated]), + ((0 to: 16) collect: [:power| (2 raisedTo: power) - 1]). + "some printable characters; alas none have code > 255" + characters := (0 to: 65535) + select: [:n| (n between: 132 and: 160) not "these have no glyph in typical fonts" + and: [(Character value: n) shouldBePrintedAsLiteral]] + thenCollect: [:n| Character value: n]. + [characters size > 32] whileTrue: + [characters := (1 to: characters size by: 2) collect: [:i| characters at: i]]. + source := ByteString streamContents: + [:s| | binaries | + binaries := binarySpecials readStream. + s nextPutAll: 'exampleMethod'; crtab. + integers + do: [:n| s print: n] + separatedBy: + [binaries atEnd ifTrue: [binaries reset]. + s space; nextPutAll: binaries next; space]. + s nextPut: $.; crtab. + s nextPut: ${; space. + characters + do: [:c| s print: c] + separatedBy: [s nextPut: $.; space]. + s space; nextPut: $}; nextPut: $.; crtab. + s nextPutAll: 'true ifTrue: [^nil] ifFalse: [^false]']. + primary := CompiledCode classPool at: #PrimaryBytecodeSetEncoderClass. + secondary := CompiledCode classPool at: #SecondaryBytecodeSetEncoderClass. + { primary. secondary } do: + [:encoderClass| | method | + method := (Parser new + encoderClass: encoderClass; + parse: source class: self class) + generate: CompiledMethodTrailer empty. + binarySpecials, integers, characters, #(nil false true) do: + [:literal| + self assert: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: false). + (encoderClass scanBlockOrNilForLiteral: literal) + ifNil: [self assert: (method hasLiteral: literal)] + ifNotNil: [:scanBlock| self assert: (method scanFor: scanBlock)]]. + + "Now test for false positives..." + integers, characters, #(nil false true) do: + [:literal| | simpleSource simpleMethod | + simpleSource := ByteString streamContents: + [:s| s nextPutAll: 'exampleMethod'; crtab; print: literal; nextPutAll: ' class']. + simpleMethod := (Parser new + encoderClass: encoderClass; + parse: simpleSource class: self class) + generate: CompiledMethodTrailer empty. + binarySpecials, integers, characters, #(nil false true) do: + [:anyLiteral| + anyLiteral == literal + ifTrue: + [self assert: (simpleMethod + refersTo: anyLiteral + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral) + thorough: false). + (encoderClass scanBlockOrNilForLiteral: anyLiteral) + ifNil: [self assert: (simpleMethod hasLiteral: anyLiteral)] + ifNotNil: [:scanBlock| self assert: (simpleMethod scanFor: scanBlock)]] + ifFalse: + [self deny: (simpleMethod + refersTo: anyLiteral + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: anyLiteral) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: anyLiteral) + thorough: false). + (encoderClass scanBlockOrNilForLiteral: anyLiteral) + ifNil: [self deny: (simpleMethod hasLiteral: anyLiteral)] + ifNotNil: [:scanBlock| self deny: (simpleMethod scanFor: scanBlock)]]]]]! Item was added: + ----- Method: LiteralRefLocatorTest>>testThoroughFindLiteralsInBytecode (in category 'tests') ----- + testThoroughFindLiteralsInBytecode + "Create a method referencing integers, characters, special selectors and nil, true & false. + Compile it and check that the objects are found." + | literals problem primary secondary | + literals := #(-1 0 1 $0 $1 1.0 #[1 2 3 4] 'one' #one nil true false NaN). + problem := Float bindingOf: #NaN. + primary := CompiledCode classPool at: #PrimaryBytecodeSetEncoderClass. + secondary := CompiledCode classPool at: #SecondaryBytecodeSetEncoderClass. + { primary. secondary } do: + [:encoderClass| | method | + "NaN's binding should still be found even though (Float bindingOf: #NaN) ~= (Float bindingOf: #NaN)" + method := (Parser new + encoderClass: encoderClass; + parse: 'foo ^NaN' class: Float) + generate: CompiledMethodTrailer empty. + [:literal| + self assert: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: false). + self assert: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: true)] value: problem. + + "All the literals should be found in a thorough search, but not otherwise" + method := (Parser new + encoderClass: encoderClass; + parse: 'foo ^', literals storeString class: Float) + generate: CompiledMethodTrailer empty. + literals, {problem. problem key} do: + [:literal| + self deny: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: false). + self assert: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: true)]. + + "Likewise if in a pragma" + method := (Parser new + encoderClass: encoderClass; + parse: 'foo <pragma: ', literals storeString, ' with: ', problem key storeString, '>' class: Float) + generate: CompiledMethodTrailer empty. + literals, {problem. problem key} do: + [:literal| + self deny: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: false). + self assert: (method + refersTo: literal + primaryBytecodeScanner: (primary scanBlockOrNilForLiteral: literal) + secondaryBytecodeScanner: (secondary scanBlockOrNilForLiteral: literal) + thorough: true)]]!

1 0

The Trunk: Kernel-eem.1160.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1160.mcz ==================== Summary ==================== Name: Kernel-eem.1160 Author: eem Time: 14 March 2018, 1:18:41.442045 pm UUID: 0a0fe6ff-b25f-435d-b991-ea7944c79aec Ancestors: Kernel-eem.1159 An addition for class-side refactorings in StringHolder. (What the hell is StringHolder doing in Kernel? :-) ) =============== Diff against Kernel-eem.1159 =============== Item was changed: ----- Method: StringHolder>>selectedClassName (in category 'accessing') ----- selectedClassName "I may know what class is currently selected" + ^self selectedClass ifNotNil: [:selectedClass| selectedClass name]! - self selectedClass ifNotNil: [^ self selectedClass name]. - ^ nil! Item was added: + ----- Method: StringHolder>>selectedClassOrMetaClassName (in category 'accessing') ----- + selectedClassOrMetaClassName + "I may know what class is currently selected" + + ^self selectedClassOrMetaClass ifNotNil: [:selectedClass| selectedClass name]!

1 0

The Trunk: Kernel-eem.1159.mcz
by commits＠source.squeak.org 14 Mar '18

14 Mar '18

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1159.mcz ==================== Summary ==================== Name: Kernel-eem.1159 Author: eem Time: 14 March 2018, 1:12:38.815374 pm UUID: 93f461ff-a65a-4a12-ba07-7512b7203329 Ancestors: Kernel-eem.1158 Provide the new multiple bytecode set aware scanning machinery in CompiledCode et al. Have Behavior>>whichSelectorsReferTo:[thorough:] use it. =============== Diff against Kernel-eem.1158 =============== Item was removed: - ----- Method: Behavior>>thoroughWhichSelectorsReferTo:special:byte: (in category 'testing method dictionary') ----- - thoroughWhichSelectorsReferTo: literal special: specialFlag byte: specialByte - "Answer a set of selectors whose methods access the argument as a - literal. Dives into the compact literal notation, making it slow but - thorough " - - ^self whichSelectorsReferTo: literal special: specialFlag byte: specialByte thorough: true! Item was changed: ----- Method: Behavior>>whichSelectorsReferTo: (in category 'testing method dictionary') ----- whichSelectorsReferTo: literal + "Answer a Set of selectors whose methods access the argument as a literal." - "Answer a Set of selectors whose methods access the argument as a - literal." + ^self whichSelectorsReferTo: literal thorough: false - | special byte | - special := Smalltalk hasSpecialSelector: literal ifTrueSetByte: [:b | byte := b]. - ^self whichSelectorsReferTo: literal special: special byte: byte "Rectangle whichSelectorsReferTo: #+."! Item was removed: - ----- Method: Behavior>>whichSelectorsReferTo:special:byte: (in category 'testing method dictionary') ----- - whichSelectorsReferTo: literal special: specialFlag byte: specialByte - "Answer a set of selectors whose methods access the argument as a literal." - - ^self whichSelectorsReferTo: literal special: specialFlag byte: specialByte thorough: false! Item was removed: - ----- Method: Behavior>>whichSelectorsReferTo:special:byte:thorough: (in category 'testing method dictionary') ----- - whichSelectorsReferTo: literal special: specialFlag byte: specialByte thorough: thorough - "Answer a set of selectors whose methods access the argument as a literal. If thorough is true, then dives into the compact literal notation, making it slow but thorough " - - | who | - who := IdentitySet new. - self selectorsAndMethodsDo: [ :selector :method | - (((thorough - ifFalse: [ method hasLiteral: literal ] - ifTrue: [ method hasLiteralThorough: literal ]) or: [ - specialFlag and: [ method scanFor: specialByte ] ]) and: [ - literal isVariableBinding not or: [ - "N.B. (method indexOfLiteral: literal) < method numLiterals copes with l;ooking for - Float bindingOf: #NaN, since (Float bindingOf: #NaN) ~= (Float bindingOf: #NaN)." - (method indexOfLiteral: literal) ~= 0] ]) ifTrue: [ - who add: selector ] ]. - ^who! Item was added: + ----- Method: Behavior>>whichSelectorsReferTo:thorough: (in category 'testing method dictionary') ----- + whichSelectorsReferTo: aLiteral thorough: thorough + "Answer a set of selectors whose methods access the argument as a literal. + If thorough is true, then dives into the compact literal notation, and pragmas, + etc, making it slow but thorough " + + | who | + who := IdentitySet new. + CompiledCode + scanBlocksForLiteral: aLiteral + do: [:primaryScanner :secondaryScanner | + self selectorsAndMethodsDo: + [ :selector :method | + (method + refersTo: aLiteral + primaryBytecodeScanner: primaryScanner + secondaryBytecodeScanner: secondaryScanner + thorough: thorough) ifTrue: + [who add: selector]]]. + ^who! Item was added: + ----- Method: CompiledBlock>>hasLiteral: (in category 'literals') ----- + hasLiteral: literal + "Answer whether the receiver references the argument, literal." + 2 to: self numLiterals do: "exclude outerCode" + [:index | | lit | + lit := self objectAt: index. + (lit literalEqual: literal) ifTrue: + [^true]. + (lit isCompiledCode and: [lit hasLiteral: literal]) ifTrue: + [^true]]. + ^false! Item was changed: ----- Method: CompiledBlock>>hasLiteralSuchThat: (in category 'literals') ----- hasLiteralSuchThat: litBlock "Answer true if litBlock returns true for any literal in this method, even if embedded in array structure." + 2 to: self numLiterals do: "exclude outerCode" - 2 to: self numLiterals do: [:index | | lit | lit := self objectAt: index. ((litBlock value: lit) or: [(lit isArray or: [lit isCompiledCode]) and: [lit hasLiteralSuchThat: litBlock]]) ifTrue: [^true]]. ^false! Item was added: + ----- Method: CompiledCode class>>scanBlocksForLiteral:do: (in category 'scanning') ----- + scanBlocksForLiteral: aLiteral do: aBinaryBlock + "Evaluate aBinaryBlock with the literal scanners for aLiteral (which will be nil + if there are no special bytecodes that access aLiteral), and answer its value." + ^aBinaryBlock + value: (PrimaryBytecodeSetEncoderClass scanBlockOrNilForLiteral: aLiteral) + value: (SecondaryBytecodeSetEncoderClass scanBlockOrNilForLiteral: aLiteral)! Item was added: + ----- Method: CompiledCode>>refersTo:bytecodeScanner:thorough: (in category 'literals') ----- + refersTo: literal bytecodeScanner: scanBlockOrNil thorough: thorough + "Answer if the receiver refers to the literal. If the scan block is non-nil, then + use it to find the literal in bytecode. If thorough is true, dive down into + literal arrays and method properties to locate references to the literal there-in." + 2 to: ((self isCompiledBlock or: [thorough]) + ifTrue: [self numLiterals ] "exclude outerCode or methodClass" + ifFalse: [self numLiterals - 1]) "exclude selector/properties and methodClass" + do: [:i| | lit | + lit := self objectAt: i. + (literal == lit or: [literal literalEqual: lit]) ifTrue: [^true]. "== for Float bindingOf: #NaN since NaN ~= NaN" + lit isCompiledCode + ifTrue: + [(lit refersTo: literal bytecodeScanner: scanBlockOrNil thorough: thorough) ifTrue: + [^true]] + ifFalse: + [thorough ifTrue: + [lit isVariableBinding + ifTrue: + [literal == lit key ifTrue: [^true]] + ifFalse: + [(lit isArray + and: [(lit hasLiteral: literal) + or: [literal isVariableBinding + and: [literal key isSymbol + and: [lit hasLiteral: literal key]]]]) ifTrue: + [^true]]]]]. + scanBlockOrNil ifNotNil: + [(self scanFor: scanBlockOrNil) ifTrue: + [^true]]. + ^false! Item was added: + ----- Method: CompiledCode>>refersTo:primaryBytecodeScanner:secondaryBytecodeScanner:thorough: (in category 'literals') ----- + refersTo: literal primaryBytecodeScanner: primaryScanBlockOrNil secondaryBytecodeScanner: secondaryScanBlockOrNil thorough: thorough + "Answer if the receiver refers to the literal. If the scan blocks are non-nil, then + use them to find the literal in bytecode. If thorough is true, dive down into + literal arrays and method properties to locate references to the literal there-in." + ^self + refersTo: literal + bytecodeScanner: (self signFlag + ifTrue: [secondaryScanBlockOrNil] + ifFalse: [primaryScanBlockOrNil]) + thorough: thorough! Item was added: + ----- Method: CompiledCode>>scanFor: (in category 'scanning') ----- + scanFor: byteOrClosure + "Answer whether the receiver contains the argument as a bytecode, if it is a number, + or evaluates to true if a block. If a block it can take from one to four bytes." + | s end | + ^(s := InstructionStream on: self) + scanFor: (byteOrClosure isBlock + ifTrue: [byteOrClosure numArgs caseOf: { + [1] -> [byteOrClosure]. + [2] -> [[:byte| byteOrClosure value: byte value: s secondByte]]. + [3] -> [end := self endPC - 2. + [:byte| + s pc <= end + and: [byteOrClosure + value: byte + value: s secondByte + value: s thirdByte]]]. + [4] -> [end := self endPC - 3. + [:byte| + s pc <= end + and: [byteOrClosure + value: byte + value: s secondByte + value: s thirdByte + value: s fourthByte]]] }] + ifFalse: [[:instr | instr = byteOrClosure]]) + " + Smalltalk browseAllSelect: [:m | m scanFor: 134] + "! Item was changed: ----- Method: CompiledMethod>>hasLiteral: (in category 'literals') ----- hasLiteral: literal "Answer whether the receiver references the argument, literal." + 2 to: self numLiterals - 1 do: "exclude selector/properties & methodClass" + [:index | | lit | + lit := self objectAt: index. + (lit literalEqual: literal) ifTrue: + [^true]. + (lit isCompiledCode and: [lit hasLiteral: literal]) ifTrue: + [^true]]. - 2 to: self numLiterals - 1 do: "exclude superclass + selector/properties" - [:index | - ((self objectAt: index) literalEqual: literal) ifTrue: [^true]]. ^false! Item was changed: ----- Method: CompiledMethod>>indexOfLiteral: (in category 'literals') ----- indexOfLiteral: literal "Answer the literal index of the argument, literal, or zero if none." + 2 to: self numLiterals - 1 "exclude selector/properties + methodClass" - 2 to: self numLiterals - 1 "exclude superclass + selector/properties" do: [:index | literal == (self objectAt: index) ifTrue: [^index - 1]]. ^0! Item was added: + ----- Method: CompiledMethod>>refersTo:bytecodeScanner:thorough: (in category 'scanning') ----- + refersTo: literal bytecodeScanner: scanBlockOrNil thorough: thorough + "Override to check method properties" + | maybeProperties | + (super refersTo: literal bytecodeScanner: scanBlockOrNil thorough: thorough) ifTrue: + [^true]. + ^thorough + and: [(maybeProperties := self penultimateLiteral) isSymbol not + and: [(maybeProperties hasLiteralThorough: literal) + or: [literal isVariableBinding + and: [literal key isSymbol + and: [maybeProperties hasLiteralThorough: literal key]]]]]! Item was removed: - ----- Method: CompiledMethod>>scanFor: (in category 'scanning') ----- - scanFor: byteOrClosure - "Answer whether the receiver contains the argument as a bytecode, - if it is a number, or evaluates to true if a block." - ^ (InstructionStream on: self) scanFor: (byteOrClosure isBlock - ifTrue: [byteOrClosure] - ifFalse: [[:instr | instr = byteOrClosure]]) - " - Smalltalk browseAllSelect: [:m | m scanFor: 134] - "!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages March 2018