[squeak-dev] The Trunk: Traits-ul.303.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Oct 21 22:07:03 UTC 2014

Levente Uzonyi uploaded a new version of Traits to project The Trunk:

==================== Summary ====================

Name: Traits-ul.303
Author: ul
Time: 21 October 2014, 4:58:50.432 pm
UUID: 2e3203a4-4362-4cf5-a69c-42e55610c23b
Ancestors: Traits-topa.302

Create the compiledMethod with the right trailer. Depends on Kernel-ul.880.

=============== Diff against Traits-topa.302 ===============

Item was changed:
  ----- Method: ClassDescription>>traitAddSelector:withMethod: (in category '*Traits-NanoKernel') -----
  traitAddSelector: selector withMethod: traitMethod
  	"Add a method inherited from a trait. 
  	Recompiles to avoid sharing and implement aliasing."
  	| oldMethod source methodNode newMethod originalSelector |
  	oldMethod := self compiledMethodAt: selector ifAbsent:[nil].
  	oldMethod ifNotNil:[
  		"The following is an important optimization as it prevents exponential
  		growth in recompilation. If T1 is used by T2 and T2 by T3 then (without
  		this optimization) any change in T1 would cause all methods in T2 to be
  		recompiled and each recompilation of a method in T2 would cause T3
  		to be fully recompiled. The test eliminates all such situations."
  		(oldMethod sameTraitCodeAs: traitMethod) ifTrue:[^oldMethod].
  	originalSelector := traitMethod selector.
  	source := traitMethod methodClass sourceCodeAt: originalSelector.
  	originalSelector == selector ifFalse:[
  		"Replace source selectors for aliases"
  		source := self replaceSelector: originalSelector withAlias: selector in: source.
  	methodNode := self newCompiler
  		compile: source in: self notifying: nil ifFail:[^nil].
+ 	newMethod := methodNode generate: (self defaultMethodTrailerIfLogSource: true).
- 	newMethod := methodNode generate: self defaultMethodTrailer.
  	newMethod putSource: source fromParseNode: methodNode inFile: 2
  		withPreamble: [:f | f cr; nextPut: $!!; nextChunkPut: 'Trait method'; cr].
  	newMethod originalTraitMethod: traitMethod.
  	^super addSelectorSilently: selector withMethod: newMethod.!

More information about the Squeak-dev mailing list