[Vm-dev] VM Maker: VMMaker.oscog-eem.715.mcz

[commits at source.squeak.org]

Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.715.mcz

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

Name: VMMaker.oscog-eem.715
Author: eem
Time: 10 May 2014, 8:46:22.584 am
UUID: 113af7b7-74d5-4593-b954-b54dd3ee4850
Ancestors: VMMaker.oscog-eem.714

And fix the hurried fix in VMMaker.oscog-eem.713.

=============== Diff against VMMaker.oscog-eem.714 ===============

Item was changed:
  ----- Method: CCodeGenerator>>addMethodFor:selector: (in category 'utilities') -----
  addMethodFor: aClass selector: selector
  	"Add the given method to the code base and answer its translation
  	 or nil if it shouldn't be translated."
  
  	| method tmethod |
  	selector == #initialize ifTrue:
  		[^nil].
  	method := aClass compiledMethodAt: selector.
  	(method pragmaAt: #doNotGenerate) ifNotNil:
  		["only remove a previous method if this one overrides it, i.e. this is a subclass method.
  		 If the existing method is in a different hierarchy this method must be merely a redeirect."
+ 		 (methods at: selector ifAbsent: []) ifNotNil:
- 		 (methods at: selector) ifNotNil:
  			[:tm|
  			(aClass includesBehavior: tm definingClass) ifTrue:
  				[methods removeKey: selector]].
  		 ^nil].
  	method isSubclassResponsibility ifTrue:
  		[methods removeKey: selector ifAbsent: [].
  		 ^nil].
  	(self shouldIncludeMethodFor: aClass selector: selector) ifFalse:
  		[methods removeKey: selector ifAbsent: [].
  		 ^nil].
  	tmethod := self addMethod: (self compileToTMethodSelector: selector in: aClass).
  	"If the method has a macro then add the macro.  But keep the method
  	 for analysis purposes (e.g. its variable accesses)."
  	(method pragmaAt: #cmacro:) ifNotNil:
  		[:pragma|
  		self addMacro: (pragma argumentAt: 1) for: selector.
  		(inlineList includes: selector) ifTrue:
  			[inlineList := inlineList copyWithout: selector]].
  	(method propertyValueAt: #cmacro:) ifNotNil:
  		[:macro|
  		self addMacro: macro for: selector.
  		(inlineList includes: selector) ifTrue:
  			[inlineList := inlineList copyWithout: selector]].
  	^tmethod!