Reworks the updating / removal of instrumented methods

Author: codeZeilen

packages/Babylonian-Compiler.package/ClassDescription.extension/instance/addAndClassifySelector.withMethod.inProtocol.notifying..st

@@ -0,0 +1,35 @@
+*Babylonian-Compiler
+addAndClassifySelector: selector withMethod: compiledMethod inProtocol: category notifying: requestor
+	
+	"This is an abomination of the Squeak Kernel code, ContextS2 code, and Babylonian Code"
+	| priorMethodOrNil |
+	(compiledMethod isCompiledMethod or: [
+		(compiledMethod respondsTo: #isBase) and: [compiledMethod isBase]]) ifTrue: [
+
+		"--- START OF COPIED CODE FROM SQUEAK KERNEL ---"
+		priorMethodOrNil := self compiledMethodAt: selector ifAbsent: [nil].
+		self addSelectorSilently: selector withMethod: compiledMethod.
+		SystemChangeNotifier uniqueInstance 
+			doSilently: [self organization classify: selector under: category].
+		priorMethodOrNil isNil
+			ifTrue: [SystemChangeNotifier uniqueInstance methodAdded: compiledMethod selector: selector inProtocol: category class: self requestor: requestor]
+			ifFalse: [SystemChangeNotifier uniqueInstance methodChangedFrom: priorMethodOrNil to: compiledMethod selector: selector inClass: self requestor: requestor].
+		"--- END OF COPIED CODE FROM SQUEAK KERNEL ---"
+		
+		"--- Babylonian code ---"
+		self updateAndRemoveBPMethods: selector.
+		"--- END OF Babylonian code ---"
+
+		] ifFalse: ["dealing with a partial layer method"
+			priorMethodOrNil := self layeredMethodDict at: compiledMethod asSymbol ifAbsent: [nil].
+			self addSelectorSilently: selector withMethod: compiledMethod.
+			SystemChangeNotifier uniqueInstance
+				doSilently: [self organization classify: compiledMethod asSymbol under: category].
+			priorMethodOrNil
+				ifNil: [SystemChangeNotifier uniqueInstance
+							methodAdded: compiledMethod method selector: compiledMethod asSymbol
+							inProtocol: category class: self requestor: requestor]
+				ifNotNil: [SystemChangeNotifier uniqueInstance
+							methodChangedFrom: (priorMethodOrNil ifNotNil: [:pm | pm method]) to: compiledMethod method
+							selector: compiledMethod asSymbol inClass: self requestor: requestor].
+		].

…sion/instance/noteCompilationOf.meta..st …on/instance/updateAndRemoveBPMethods..stpackages/Babylonian-Compiler.package/ClassDescription.extension/instance/noteCompilationOf.meta..st renamed to packages/Babylonian-Compiler.package/ClassDescription.extension/instance/updateAndRemoveBPMethods..st packages/Babylonian-Compiler.package/ClassDescription.extension/instance/noteCompilationOf.meta..st renamed to packages/Babylonian-Compiler.package/ClassDescription.extension/instance/updateAndRemoveBPMethods..st

@@ -1,9 +1,9 @@
 *Babylonian-Compiler
-noteCompilationOf: aSelector meta: isMeta
+updateAndRemoveBPMethods: aSelector
 
 	| theClass method methodHasInstalledInstrumentation sourceIsNotInstrumented |
-	theClass := isMeta ifTrue: [self class] ifFalse: [self].
-	method := theClass>>aSelector.
+	theClass := self.
+	method := theClass>>aSelector. 
 
 	sourceIsNotInstrumented := (BPCompiler new methodSourceRequiresBPLayers: method getSource) not.
 	methodHasInstalledInstrumentation := method isContextSMethod and: [method isLayered and: [method allInvolvedLayers = #(bpInstrumented)]].

packages/Babylonian-Compiler.package/ClassDescription.extension/methodProperties.json

@@ -2,4 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"noteCompilationOf:meta:" : "pre 10/9/2020 11:03" } }
+		"addAndClassifySelector:withMethod:inProtocol:notifying:" : "pre 10/12/2020 17:00",
+		"updateAndRemoveBPMethods:" : "pre 10/12/2020 16:41" } }