Skip to content

Commit

Permalink
Issue #783: checkpoint ... Rowan 2 upgrade and post upgrade unit test…
Browse files Browse the repository at this point in the history
…s run clean
  • Loading branch information
dalehenrich committed Jul 26, 2024
1 parent 5b8f031 commit 0630e1d
Showing 1 changed file with 11 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1417,11 +1417,20 @@ UpgradeRowanV2 >> repairMissingLoadedMethod: methodSpec inClassNamed: className
(isMeta
ifTrue: [ ' class' ]
ifFalse: [ '' ]) , '>>' , selector , ' in package named '
, thePackageName
, '. The loadedMethod belongs to a different package '
, thePackageName , '. The method belongs to a different package '
, theCompiledMethod rowanPackageName printString
, ' and is expected to be moved.'.
^ self ].
(selector = #'isRowanLoadedMethod' and: [ className = 'Object' ])
ifTrue: [
self
logMessage:
' SKIP repair for method: ' , className
,
(isMeta
ifTrue: [ ' class' ]
ifFalse: [ '' ]) , '>>' , selector , ', it will be handled later'.
^ self ].
dbg
ifTrue: [ self logMessage: '[DEBUG] repairMissingLoadedMethod: [5]' ].
Rowan packageTools adopt
Expand Down Expand Up @@ -1743,9 +1752,6 @@ UpgradeRowanV2 >> step_4_reloadRowan [
self logMessage: 'reload Rowan'.
self debugToLog.
self reloadRowan.
(GsNMethod compiledMethodAt: #isFromRowan otherwise: nil)
ifNotNil: [:meth | self logMessage: 'GsNMethod>>isFromRowan origin: ', meth origin printString ]
ifNil: [System waitForDebug].
self debugToLog.
self commit
]
Expand Down

0 comments on commit 0630e1d

Please sign in to comment.