<body><div id="__MailbirdStyleContent" style="font-size: 10pt;font-family: Arial;color: #000000">
Hi Christoph,<div><br></div><div>> ..<span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px"> </span><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px">and they are still isolated from the discussion on the mailing list ... :-)</span></div><div><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px"><br></span></div><div><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px">That may be right. Still, the biggest effort lies in the code review itself. It's really easy to look up such a discussion if needed. Sure, you need to re-type that version number into the search function on forum.world.st ... still ... not that hard. ;-)</span></div><div><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px"><br></span></div><div><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px">You might think that an inbox commit is often not merged because of an open question on the list. Well, I think that's rarely the case. It's typically just time and people. ;-) No need to throw in even more tools into the ring.</span></div><div><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px"><br></span></div><div><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px">Best,</span></div><div><span style="font-family: Calibri, Helvetica, sans-serif;font-size: 16px">Marcel</span></div><div class="mb_sig"></div><blockquote class='history_container' type='cite' style='border-left-style:solid;border-width:1px; margin-top:20px; margin-left:0px;padding-left:10px;'>
<p style='color: #AAAAAA; margin-top: 10px;'>Am 01.10.2020 22:34:21 schrieb Thiede, Christoph <christoph.thiede@student.hpi.uni-potsdam.de>:</p><div style='font-family:Arial,Helvetica,sans-serif'>
<div id="divtagdefaultwrapper" style="font-size: 12pt;color: #000000;font-family: Calibri,Helvetica,sans-serif" dir="ltr">
<p>Hi Marcel,</p>
<p><br>
</p>
<p>this is a very nice script and demonstrates the powerfulness of Vivide very well! Still, it does not show any links between multiple inbox/trunk versions, and they are still isolated from the discussion on the mailing list ... :-)</p>
<p><br>
</p>
<p>Best,</p>
<p>Christoph</p>
<div id="Signature">
<div id="divtagdefaultwrapper" dir="ltr" style="font-size: 12pt;color: rgb(0, 0, 0);font-family: Calibri, Helvetica, sans-serif, EmojiFont, "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols">
<div name="divtagdefaultwrapper" style="font-family: Calibri,Arial,Helvetica,sans-serif;font-size: ;margin: 0">
<div>
<div class="_rp_T4" id="Item.MessagePartBody">
<div class="_rp_U4 ms-font-weight-regular ms-font-color-neutralDark rpHighlightAllClass rpHighlightBodyClass" id="Item.MessageUniqueBody" style="font-family:wf_segoe-ui_normal,"Segoe UI","Segoe WP",Tahoma,Arial,sans-serif,serif,EmojiFont">
<div dir="ltr">
<div id="divtagdefaultwrapper"><span style="font-family: Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols">
<div id="Signature">
<div style="margin:0px"><font style="font-family:Calibri,Arial,Helvetica,sans-serif,serif,EmojiFont">
<div><font size="3" color="black"><span style="font-size: 12pt"><a href="http://www.hpi.de/" target="_blank" rel="noopener noreferrer" id="LPNoLP"><font size="2"><span id="LPlnk909538"><font color="#757B80"></font></span></font></a></span></font></div>
</font></div>
</div>
</span></div>
</div>
</div>
</div>
</div>
<div><span style="font-size: 10pt;color: #808080"></span></div>
</div>
</div>
</div>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><span style="font-family: Calibri, sans-serif;color: #000000"><b>Von:</b> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> im Auftrag von Taeumel, Marcel<br>
<b>Gesendet:</b> Donnerstag, 1. Oktober 2020 14:35:16<br>
<b>An:</b> squeak-dev<br>
<b>Betreff:</b> Re: [squeak-dev] The Inbox: Tools-ct.991.mcz</span>
<div> </div>
</div>
<div>
<div id="__MailbirdStyleContent" style="font-size: 10pt;font-family: Arial;color: #000000">
Hi Christoph,
<div><br>
</div>
<div>I use a small Vivide script to keep track of your (and other) changes:</div>
<div><br>
</div>
<div><img id="0713be1e-1e45-425d-83df-06e1567460d5" width="1214" height="675" src="cid:18a7980d-e3d4-49ac-ac7b-e801ec695eb2"></img><!-- </img> --><br>
</div>
<div><br>
</div>
<div>Best,</div>
<div>Marcel</div>
<div class="mb_sig"></div>
<blockquote class="history_container" type="cite" style="border-left-style: solid;border-width: 1px;margin-top: 20px;margin-left: 0px;padding-left: 10px;min-width: 500px">
<p style="color: #AAAAAA; margin-top: 10px;">Am 01.10.2020 14:08:05 schrieb Thiede, Christoph <christoph.thiede@student.hpi.uni-potsdam.de>:</p>
<div style="font-family:Arial,Helvetica,sans-serif">
<div id="divtagdefaultwrapper" style="font-size: 12pt;color: #000000;font-family: Calibri,Helvetica,sans-serif" dir="ltr">
<p>Hi Marcel,</p>
<p><br>
</p>
<p>sorry. As already mentioned, it can be hard to keep an overview of currently 307 open inbox versions and their interdependencies ... 😫</p>
<p><br>
</p>
<p>Best,</p>
<p>Christoph</p>
<div id="Signature">
<div id="divtagdefaultwrapper" dir="ltr" style="font-size: 12pt;color: rgb(0, 0, 0);font-family: Calibri, Helvetica, sans-serif, EmojiFont, "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols">
<div name="divtagdefaultwrapper" style="font-family: Calibri,Arial,Helvetica,sans-serif;font-size: ;margin: 0">
<div>
<div class="_rp_T4" id="Item.MessagePartBody">
<div class="_rp_U4 ms-font-weight-regular ms-font-color-neutralDark rpHighlightAllClass rpHighlightBodyClass" id="Item.MessageUniqueBody" style="font-family:wf_segoe-ui_normal,"Segoe UI","Segoe WP",Tahoma,Arial,sans-serif,serif,EmojiFont">
<div dir="ltr">
<div id="divtagdefaultwrapper"><span style="font-family: Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols">
<div id="Signature">
<div style="margin:0px"><span style="">
<div><font size="3" color="black"><span style="font-size: 12pt"><a href="http://www.hpi.de/" target="_blank" rel="noopener noreferrer" id="LPNoLP"><font size="2"><span id="LPlnk909538"><font color="#757B80"></font></span></font></a></span></font></div>
</span></div>
</div>
</span></div>
</div>
</div>
</div>
</div>
<div><span style="font-size: 10pt;color: #808080"></span></div>
</div>
</div>
</div>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><span style="font-family: Calibri, sans-serif;color: #000000"><b>Von:</b> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> im Auftrag von Taeumel, Marcel<br>
<b>Gesendet:</b> Donnerstag, 1. Oktober 2020 14:04:06<br>
<b>An:</b> squeak-dev<br>
<b>Betreff:</b> Re: [squeak-dev] The Inbox: Tools-ct.991.mcz</span>
<div> </div>
</div>
<div>
<div id="__MailbirdStyleContent" style="font-size: 10pt;font-family: Arial;color: #000000">
Hi Christoph,
<div><br>
</div>
<div>that's funny. You already did that with Tools-ct.957. :-) I will move both 956 and 957 to treated.</div>
<div><br>
</div>
<div>Best,</div>
<div>Marcel</div>
<div class="mb_sig"></div>
<blockquote class="history_container" type="cite" style="border-left-style: solid;border-width: 1px;margin-top: 20px;margin-left: 0px;padding-left: 10px;min-width: 500px">
<p style="color: #AAAAAA; margin-top: 10px;">Am 30.09.2020 19:46:56 schrieb commits@source.squeak.org <commits@source.squeak.org>:</p>
<div style="font-family:Arial,Helvetica,sans-serif">Christoph Thiede uploaded a new version of Tools to project The Inbox:<br>
http://source.squeak.org/inbox/Tools-ct.991.mcz<br>
<br>
==================== Summary ====================<br>
<br>
Name: Tools-ct.991<br>
Author: ct<br>
Time: 30 September 2020, 7:46:39.949807 pm<br>
UUID: 4d2f75ef-336d-cc4c-aa0d-dd4f7ff99fc7<br>
Ancestors: Tools-mt.990<br>
<br>
Fixes a bug in DebuggerMethodMap's rangeForPC lookup<br>
<br>
Steps to reproduce:<br>
<br>
c := Object newSubclass.<br>
c compile: 'foo: foo<br>
foo = #foo ifTrue: [^ true].<br>
^ (foo ifNil: [^ false]) = #bar'.<br>
c new foo: #bar.<br>
"Debug it. Step into #foo:, step over #=.<br>
Before this commit, the selection was '^ true'"<br>
<br>
The error was that #findNearbyBinaryIndex: uses to return the lower possible index if there is no exact match. For debugging, we cannot need this behavior, because we want to select the next operation to be executed.<br>
<br>
Furthermore, this commit refactors some duplication with DebuggerMethodMapForFullBlockCompiledMethod. Please review!<br>
<br>
Uploaded again due to totally broken ancestry. Replaces Tools-ct.956, which can be moved into the treated inbox.<br>
<br>
=============== Diff against Tools-mt.990 ===============<br>
<br>
Item was changed:<br>
----- Method: DebuggerMethodMap>>rangeForPC:in:contextIsActiveContext: (in category 'source mapping') -----<br>
rangeForPC: contextsConcretePC in: method contextIsActiveContext: contextIsActiveContext<br>
+ "Answer the indices in the source code for the supplied pc. If the context is the active context (is at the hot end of the stack) then its pc is the current pc. But if the context isn't, because it is suspended sending a message, then its current pc is the
previous pc."<br>
- "Answer the indices in the source code for the supplied pc.<br>
- If the context is the actve context (is at the hot end of the stack)<br>
- then its pc is the current pc. But if the context isn't, because it is<br>
- suspended sending a message, then its current pc is the previous pc."<br>
<br>
+ | pc i end sortedMap |<br>
- | pc i end |<br>
pc := method abstractPCForConcretePC: (contextIsActiveContext<br>
+ ifTrue: [contextsConcretePC]<br>
+ ifFalse: [(method pcPreviousTo: contextsConcretePC)<br>
+ ifNil: [contextsConcretePC]]).<br>
+ (self abstractSourceMapForMethod: method)<br>
+ at: pc<br>
+ ifPresent: [:range | ^ range].<br>
+ sortedMap := self sortedSourceMapForMethod: method.<br>
+ sortedMap ifEmpty: [^ 1 to: 0].<br>
+ i := sortedMap<br>
+ findBinaryIndex: [:assoc | pc - assoc key]<br>
+ ifNone: [:lower :upper | upper].<br>
+ i < 1 ifTrue: [^ 1 to: 0].<br>
+ i > sortedMap size ifTrue: [<br>
+ end := sortedMap inject: 0 into: [:prev :this |<br>
+ prev max: this value last].<br>
+ ^ end + 1 to: end].<br>
+ ^ (sortedMap at: i) value!<br>
- ifTrue: [contextsConcretePC]<br>
- ifFalse: [(method pcPreviousTo: contextsConcretePC)<br>
- ifNotNil: [:prevpc| prevpc]<br>
- ifNil: [contextsConcretePC]]).<br>
- (self abstractSourceMap includesKey: pc) ifTrue:<br>
- [^self abstractSourceMap at: pc].<br>
- sortedSourceMap ifNil:<br>
- [sortedSourceMap := self abstractSourceMap associations<br>
- replace: [ :each | each copy ];<br>
- sort].<br>
- sortedSourceMap isEmpty ifTrue: [^1 to: 0].<br>
- i := sortedSourceMap findNearbyBinaryIndex: [:assoc| pc - assoc key].<br>
- i < 1 ifTrue: [^1 to: 0].<br>
- i > sortedSourceMap size ifTrue:<br>
- [end := sortedSourceMap inject: 0 into:<br>
- [:prev :this | prev max: this value last].<br>
- ^end+1 to: end].<br>
- ^(sortedSourceMap at: i) value<br>
- <br>
- "| method source scanner map |<br>
- method := DebuggerMethodMap compiledMethodAt: #rangeForPC:in:contextIsActiveContext:.<br>
- source := method getSourceFromFile asString.<br>
- scanner := InstructionStream on: method.<br>
- map := method debuggerMap.<br>
- Array streamContents:<br>
- [:ranges|<br>
- [scanner atEnd] whileFalse:<br>
- [| range |<br>
- range := map rangeForPC: scanner pc in: method contextIsActiveContext: true.<br>
- ((map abstractSourceMap includesKey: scanner abstractPC)<br>
- and: [range first ~= 0]) ifTrue:<br>
- [ranges nextPut: (source copyFrom: range first to: range last)].<br>
- scanner interpretNextInstructionFor: InstructionClient new]]"!<br>
<br>
Item was added:<br>
+ ----- Method: DebuggerMethodMap>>sortedSourceMap (in category 'private') -----<br>
+ sortedSourceMap<br>
+ <br>
+ ^ sortedSourceMap ifNil: [<br>
+ sortedSourceMap := self abstractSourceMap associations<br>
+ replace: [:each | each copy];<br>
+ sort]!<br>
<br>
Item was added:<br>
+ ----- Method: DebuggerMethodMap>>sortedSourceMapForMethod: (in category 'source mapping') -----<br>
+ sortedSourceMapForMethod: aCompiledMethod<br>
+ <br>
+ ^ self sortedSourceMap!<br>
<br>
Item was changed:<br>
----- Method: DebuggerMethodMapForFullBlockCompiledMethods>>abstractSourceMap (in category 'source mapping') -----<br>
abstractSourceMap<br>
+ <br>
+ ^ self shouldNotImplement!<br>
- self shouldNotImplement!<br>
<br>
Item was removed:<br>
- ----- Method: DebuggerMethodMapForFullBlockCompiledMethods>>rangeForPC:in:contextIsActiveContext: (in category 'source mapping') -----<br>
- rangeForPC: contextsConcretePC in: method contextIsActiveContext: contextIsActiveContext<br>
- "Answer the indices in the source code for the supplied pc.<br>
- If the context is the actve context (is at the hot end of the stack)<br>
- then its pc is the current pc. But if the context isn't, because it is<br>
- suspended sending a message, then its current pc is the previous pc."<br>
- <br>
- | pc i end mapForMethod sortedMap |<br>
- pc := method abstractPCForConcretePC: (contextIsActiveContext<br>
- ifTrue: [contextsConcretePC]<br>
- ifFalse: [(method pcPreviousTo: contextsConcretePC)<br>
- ifNotNil: [:prevpc| prevpc]<br>
- ifNil: [contextsConcretePC]]).<br>
- ((mapForMethod := self abstractSourceMapForMethod: method) includesKey: pc) ifTrue:<br>
- [^mapForMethod at: pc].<br>
- sortedSourceMap ifNil:<br>
- [sortedSourceMap := IdentityDictionary new].<br>
- sortedMap := sortedSourceMap<br>
- at: method<br>
- ifAbsentPut: [mapForMethod associations<br>
- replace: [ :each | each copy ];<br>
- sort].<br>
- sortedMap isEmpty ifTrue: [^1 to: 0].<br>
- i := sortedMap findNearbyBinaryIndex: [:assoc| pc - assoc key].<br>
- i < 1 ifTrue: [^1 to: 0].<br>
- i > sortedMap size ifTrue:<br>
- [end := sortedMap inject: 0 into:<br>
- [:prev :this | prev max: this value last].<br>
- ^end+1 to: end].<br>
- ^(sortedMap at: i) value<br>
- <br>
- "| method source scanner map |<br>
- method := DebuggerMethodMapForFullBlockCompiledMethods compiledMethodAt: #rangeForPC:in:contextIsActiveContext:.<br>
- source := method getSourceFromFile asString.<br>
- scanner := InstructionStream on: method.<br>
- map := method debuggerMap.<br>
- Array streamContents:<br>
- [:ranges|<br>
- [scanner atEnd] whileFalse:<br>
- [| range |<br>
- range := map rangeForPC: scanner pc in: method contextIsActiveContext: true.<br>
- ((map abstractSourceMap includesKey: scanner abstractPC)<br>
- and: [range first ~= 0]) ifTrue:<br>
- [ranges nextPut: (source copyFrom: range first to: range last)].<br>
- scanner interpretNextInstructionFor: InstructionClient new]]"!<br>
<br>
Item was added:<br>
+ ----- Method: DebuggerMethodMapForFullBlockCompiledMethods>>sortedSourceMap (in category 'source mapping') -----<br>
+ sortedSourceMap<br>
+ <br>
+ ^ self shouldNotImplement!<br>
<br>
Item was added:<br>
+ ----- Method: DebuggerMethodMapForFullBlockCompiledMethods>>sortedSourceMapForMethod: (in category 'source mapping') -----<br>
+ sortedSourceMapForMethod: method<br>
+ <br>
+ sortedSourceMap ifNil: [<br>
+ sortedSourceMap := IdentityDictionary new].<br>
+ ^ sortedSourceMap<br>
+ at: method<br>
+ ifAbsentPut: [(self abstractSourceMapForMethod: method) associations<br>
+ replace: [ :each | each copy ];<br>
+ sort]!<br>
<br>
<br>
</div>
</blockquote>
</div>
</div>
</div>
</blockquote>
</div>
</div>
</div></blockquote>
</div></body>