[Pkg] The Trunk: Kernel-eem.700.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Jun 28 17:31:49 UTC 2012

Eliot Miranda uploaded a new version of Kernel to project The Trunk:

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

Name: Kernel-eem.700
Author: eem
Time: 28 June 2012, 10:30:56.246 am
UUID: 18c57dcf-d75b-4c61-b5a3-67a9f8cfa4f6
Ancestors: Kernel-fbs.699

Back out of my bogus fix to runUntilErrorOrReturnFrom:.
My "fix" breaks non-local return in the debugger.
I can't find my original case that justified the new code
(although it was that in the debugger too much stack was
unwound), and so it needs to be backed-out and we need
to find good test cases to fix this correctly.

=============== Diff against Kernel-fbs.699 ===============

Item was changed:
  ----- Method: ContextPart>>runUntilErrorOrReturnFrom: (in category 'controlling') -----
  runUntilErrorOrReturnFrom: aSender 
  	"ASSUMES aSender is a sender of self.  Execute self's stack until aSender returns or an unhandled exception is raised.  Return a pair containing the new top context and a possibly nil exception.  The exception is not nil if it was raised before aSender returned and it was not handled.  The exception is returned rather than openning the debugger, giving the caller the choice of how to handle it."
  	"Self is run by jumping directly to it (the active process abandons thisContext and executes self).  However, before jumping to self we insert an ensure block under aSender that jumps back to thisContext when evaluated.  We also insert an exception handler under aSender that jumps back to thisContext when an unhandled exception is raised.  In either case, the inserted ensure and exception handler are removed once control jumps back to thisContext."
+ 	| error ctxt here topContext |
- 	| error ctxt here topContext aSendersSender |
  	here := thisContext.
- 	aSendersSender := aSender sender.
  	"Insert ensure and exception handler contexts under aSender"
  	error := nil.
  	ctxt := aSender insertSender: (ContextPart
  		contextOn: UnhandledError do: [:ex |
  			error ifNil: [
  				error := ex exception.
  				topContext := thisContext.
  				ex resumeUnchecked: here jump]
  			ifNotNil: [ex pass]
  	ctxt := ctxt insertSender: (ContextPart
  		contextEnsure: [error ifNil: [
  				topContext := thisContext.
  				here jump]
  	self jump.  "Control jumps to self"
  	"Control resumes here once above ensure block or exception handler is executed"
  	^ error ifNil: [
  		"No error was raised, remove ensure context by stepping until popped"
+ 		[ctxt isDead] whileFalse: [topContext := topContext stepToCallee].
+ 		{topContext. nil}
- 		[ctxt isDead or: [aSender isDead]] whileFalse: [topContext := topContext stepToCallee].
- 		^{aSender isDead
- 			ifTrue:
- 				[| retValue |
- 				retValue := (ctxt method == (BlockClosure >> #ensure:)
- 							or: [ctxt method == (BlockClosure >> #ifCurtailed:)]) ifTrue:
- 								[ctxt tempAt: 3]. "returnValue in ensure: and result in ifCurtailed:"
- 				aSendersSender push: retValue.
- 				aSendersSender]
- 			ifFalse: [topContext].
- 		     nil}
  	] ifNotNil: [
  		"Error was raised, remove inserted above contexts then return signaler context"
  		aSender terminateTo: ctxt sender.  "remove above ensure and handler contexts"
  		{topContext. error}

More information about the Packages mailing list