Skip to content

Fix CleanBlockClosure/ConstantBlockClosure Tost materialization (dead startpc reference) #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oliveiraallex wants to merge 4 commits into from
Closed

Fix CleanBlockClosure/ConstantBlockClosure Tost materialization (dead startpc reference) #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9195104
Fixed baselibe to compatiblity to Pharo 13
oliveiraallex Aug 11, 2026
6ac17df
Fixed baseline to compatibility to Pharo 13
oliveiraallex Aug 11, 2026
df98b40
Fixed baseline typo
oliveiraallex Aug 11, 2026
ddc45c1
Fix CleanBlockClosure/ConstantBlockClosure Tost materialization (dead…
oliveiraallex Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions BaselineOfTostSerializer/BaselineOfTostSerializer.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
Class {
#name : #BaselineOfTostSerializer,
#superclass : #BaselineOf,
#category : 'BaselineOfTostSerializer'
#name : 'BaselineOfTostSerializer',
#superclass : 'BaselineOf',
#category : 'BaselineOfTostSerializer',
#package : 'BaselineOfTostSerializer'
}

{ #category : #baselines }
{ #category : 'baselines' }
BaselineOfTostSerializer >> baseline: spec [
<baseline>
spec for: #'common' do: [
spec
baseline: 'StateSpecs' with: [
spec repository: 'github://dionisiydk/StateSpecs:v5.0.2'];
spec repository: 'github://oliveiraallex/StateSpecs:dev13'];
baseline: 'ObjectTravel' with: [
spec
repository: 'github://pharo-ide/ObjectTravel:v1.0.4';
repository: 'github://oliveiraallex/ObjectTravel:dev13';
loads: 'Core' ];
project: 'ObjectTravelTests' copyFrom: 'ObjectTravel' with: [
spec loads: 'Tests'].
Expand All @@ -27,7 +28,7 @@ BaselineOfTostSerializer >> baseline: spec [

]

{ #category : #accessing }
{ #category : 'accessing' }
BaselineOfTostSerializer >> projectClass [
^ [ self class environment at: #MetacelloCypressBaselineProject ]
on: NotFound
Expand Down
2 changes: 1 addition & 1 deletion BaselineOfTostSerializer/package.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Package { #name : #BaselineOfTostSerializer }
Package { #name : 'BaselineOfTostSerializer' }
6 changes: 3 additions & 3 deletions TostSerializer/Bitmap.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Extension { #name : #Bitmap }
Extension { #name : 'Bitmap' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Bitmap class >> createTostInstanceWith: aTostTransporter [
| bytes |
bytes := ByteArray createTostInstanceWith: aTostTransporter.
^Bitmap decompressFromByteArray: bytes
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Bitmap >> writeTostBodyWith: aTostTransporter [
self compressToByteArray writeTostBodyWith: aTostTransporter
]
8 changes: 4 additions & 4 deletions TostSerializer/BlockClosure.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #BlockClosure }
Extension { #name : 'BlockClosure' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
BlockClosure >> correctTostMaterializationWith: materializedWordSize [

| numLiterals originalLiteralSize newLiteralSize |
Expand All @@ -12,7 +12,7 @@ BlockClosure >> correctTostMaterializationWith: materializedWordSize [
startpc := startpc - (originalLiteralSize - newLiteralSize)
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
BlockClosure class >> createTostInstanceWith: aTostTransporter [
| block wordSize |
block := super createTostInstanceWith: aTostTransporter.
Expand All @@ -22,7 +22,7 @@ BlockClosure class >> createTostInstanceWith: aTostTransporter [
^block
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
BlockClosure >> writeTostBodyWith: aTostTransporter [
super writeTostBodyWith: aTostTransporter.

Expand Down
4 changes: 2 additions & 2 deletions TostSerializer/Boolean.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Boolean }
Extension { #name : 'Boolean' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Boolean >> isTostValueObject [
^true
]
6 changes: 3 additions & 3 deletions TostSerializer/ByteArray.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Extension { #name : #ByteArray }
Extension { #name : 'ByteArray' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
ByteArray class >> createTostInstanceWith: aTostTransporter [
| size |
size := aTostTransporter readPositiveInteger.
^aTostTransporter readBytes: size as: self
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
ByteArray >> writeTostBodyWith: aTostTransporter [
super writeTostBodyWith: aTostTransporter.
aTostTransporter writeBytes: self
Expand Down
8 changes: 4 additions & 4 deletions TostSerializer/Character.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Extension { #name : #Character }
Extension { #name : 'Character' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Character class >> createTostInstanceWith: aTostTransporter [

^self value: aTostTransporter readPositiveInteger
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Character >> isTostValueObject [
^true
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Character >> writeTostBodyWith: aTostTransporter [

aTostTransporter writePositiveInteger: self asInteger
Expand Down
4 changes: 2 additions & 2 deletions TostSerializer/ClassDescription.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #ClassDescription }
Extension { #name : 'ClassDescription' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
ClassDescription >> createTostInstanceWith: aTostTransporter [
^self isVariable
ifTrue: [ self basicNew: aTostTransporter readPositiveInteger ]
Expand Down
25 changes: 25 additions & 0 deletions TostSerializer/CleanBlockClosure.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Extension { #name : 'CleanBlockClosure' }

{ #category : '*TostSerializer' }
CleanBlockClosure >> correctTostMaterializationWith: materializedWordSize [
"CleanBlockClosure (and its subclass ConstantBlockClosure) has no difference in binary presentation in 32 and 64 bit images.
Therefore nothing to do here"


]

{ #category : '*TostSerializer' }
CleanBlockClosure class >> createTostInstanceWith: aTostTransporter [
"CleanBlockClosure has no difference in binary presentation in 32 and 64 bit images.
Therefore the instantiation method here is simplified to Object version"

^ self basicNew: aTostTransporter readPositiveInteger
]

{ #category : '*TostSerializer' }
CleanBlockClosure >> writeTostBodyWith: aTostTransporter [
"CleanBlockClosure has no difference in binary presentation in 32 and 64 bit images.
Therefore the serialization method here is simplified to Object version"

aTostTransporter writePositiveInteger: self size
]
6 changes: 3 additions & 3 deletions TostSerializer/CompiledCode.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #CompiledCode }
Extension { #name : 'CompiledCode' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
CompiledCode class >> createTostInstanceWith: aTostTransporter [

| size bytecodes method header numLiterals wordSize literalSize newLiteralSize |
Expand All @@ -22,7 +22,7 @@ CompiledCode class >> createTostInstanceWith: aTostTransporter [
^method
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
CompiledCode >> writeTostBodyWith: aTostTransporter [
| bytecodes initialPC |
initialPC := self initialPC.
Expand Down
8 changes: 4 additions & 4 deletions TostSerializer/Context.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Context }
Extension { #name : 'Context' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Context >> correctTostMaterializationWith: materializedWordSize [

| numLiterals originalLiteralSize newLiteralSize |
Expand All @@ -13,7 +13,7 @@ Context >> correctTostMaterializationWith: materializedWordSize [
pc := pc - (originalLiteralSize - newLiteralSize)
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Context class >> createTostInstanceWith: aTostTransporter [

| frameSize wordSize context |
Expand All @@ -25,7 +25,7 @@ Context class >> createTostInstanceWith: aTostTransporter [
^context
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Context >> writeTostBodyWith: aTostTransporter [

aTostTransporter writeByte: Smalltalk wordSize.
Expand Down
4 changes: 2 additions & 2 deletions TostSerializer/False.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #False }
Extension { #name : 'False' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
False class >> createTostInstanceWith: aTostTransporter [

^false
Expand Down
6 changes: 3 additions & 3 deletions TostSerializer/Float.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Float }
Extension { #name : 'Float' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Float class >> createTostInstanceWith: aTostTransporter [
^ (self new: 2)
at: 1 put: aTostTransporter readPositiveInteger;
Expand All @@ -9,7 +9,7 @@ Float class >> createTostInstanceWith: aTostTransporter [

]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Float >> writeTostBodyWith: aTostTransporter [

aTostTransporter
Expand Down
6 changes: 3 additions & 3 deletions TostSerializer/Fraction.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Fraction }
Extension { #name : 'Fraction' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Fraction class >> createTostInstanceWith: aTostTransporter [

| denominator numerator |
Expand All @@ -10,7 +10,7 @@ Fraction class >> createTostInstanceWith: aTostTransporter [
^numerator / denominator
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Fraction >> writeTostBodyWith: aTostTransporter [

aTostTransporter writePositiveInteger: denominator.
Expand Down
8 changes: 4 additions & 4 deletions TostSerializer/FullBlockClosure.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Extension { #name : #FullBlockClosure }
Extension { #name : 'FullBlockClosure' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
FullBlockClosure >> correctTostMaterializationWith: materializedWordSize [
"FullBlockClosure has no difference in binary presentation in 32 and 64 bit images.
Therefore nothing to do here"
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
FullBlockClosure class >> createTostInstanceWith: aTostTransporter [
"FullBlockClosure has no difference in binary presentation in 32 and 64 bit images.
Therefore the instantiation method here is simplified to Object version"

^self basicNew: aTostTransporter readPositiveInteger
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
FullBlockClosure >> writeTostBodyWith: aTostTransporter [
"FullBlockClosure has no difference in binary presentation in 32 and 64 bit images.
Therefore the serialization method here is simplified to Object version"
Expand Down
4 changes: 2 additions & 2 deletions TostSerializer/HashedCollection.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #HashedCollection }
Extension { #name : 'HashedCollection' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
HashedCollection class >> createTostInstanceWith: aTostTransporter [

| instance |
Expand Down
10 changes: 5 additions & 5 deletions TostSerializer/Integer.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Extension { #name : #Integer }
Extension { #name : 'Integer' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Integer >> byteAt: anInteger [
"Compatibility with Pharo7. In Pharo8/9 #digitAt: was changed to #byteAt:"
^ self digitAt: anInteger
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Integer >> bytesCount [
"Compatibility with Pharo7. In Pharo8/9 #digitLength was changed to #bytesCount"
^ self digitLength
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Integer class >> createTostInstanceWith: aTostTransporter [
^aTostTransporter readInteger
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Integer >> writeTostBodyWith: aTostTransporter [

aTostTransporter writeInteger: self
Expand Down
4 changes: 2 additions & 2 deletions TostSerializer/Number.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Number }
Extension { #name : 'Number' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Number >> isTostValueObject [
^true
]
6 changes: 3 additions & 3 deletions TostSerializer/Object.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Extension { #name : #Object }
Extension { #name : 'Object' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Object >> isTostValueObject [
^false
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Object >> writeTostBodyWith: aTostTransporter [

self class isVariable ifTrue: [ aTostTransporter writePositiveInteger: self size]
Expand Down
4 changes: 2 additions & 2 deletions TostSerializer/SmallFloat64.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #SmallFloat64 }
Extension { #name : 'SmallFloat64' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
SmallFloat64 class >> createTostInstanceWith: aTostTransporter [
^ (BoxedFloat64 createTostInstanceWith: aTostTransporter) * 1.0
]
6 changes: 3 additions & 3 deletions TostSerializer/String.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Extension { #name : #String }
Extension { #name : 'String' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
String class >> createTostInstanceWith: aTostTransporter [

^aTostTransporter readString: self
]

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
String >> writeTostBodyWith: aTostTransporter [

aTostTransporter writeString: self
Expand Down
4 changes: 2 additions & 2 deletions TostSerializer/Symbol.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Symbol }
Extension { #name : 'Symbol' }

{ #category : #'*TostSerializer' }
{ #category : '*TostSerializer' }
Symbol class >> createTostInstanceWith: aTostTransporter [

| string |
Expand Down
Loading
Loading