There has been a regression as the same exception is not returning to…

… the correct singalling context when resuming.

- Returning to previous change introduced in #10429
- Fix #10651
- Adding Tests

src/Kernel-Tests/ExceptionTest.class.st

@@ -30,6 +30,14 @@ ExceptionTest >> assertSuccess: anExceptionTester [
 	self should: [ ( anExceptionTester suiteLog first) endsWith:  'succeeded'].
 ]
 
+{ #category : #utilities }
+ExceptionTest >> methodSignallingZeroDivide [
+
+	^ [ 1 / 0 ]
+		  on: ZeroDivide
+		  do: [ :e | e signal ]
+]
+
 { #category : #private }
 ExceptionTest >> runCaseManaged [
 	"We should disable TestEnvironment to avoid any logic for unhandled errors from background processes.
@@ -314,6 +322,19 @@ ExceptionTest >> testResignalAsUnwinds [
 	self assert: answer == 5
 ]
 
+{ #category : #'tests - resignal' }
+ExceptionTest >> testResignalExceptionThatHasBeenSignaledTwice [
+
+	| shouldBe17 |
+	shouldBe17 := nil.
+
+	[ shouldBe17 := self methodSignallingZeroDivide ]
+		on: ZeroDivide
+		do: [ :e | e resume: 17 ].
+
+	self assert: shouldBe17 notNil
+]
+
 { #category : #'tests - exceptiontester' }
 ExceptionTest >> testResumableFallOffTheEndHandler [
 	self assertSuccess: (ExceptionTester new runTest: #resumableFallOffTheEndHandler )

src/Kernel/Context.class.st

@@ -732,8 +732,8 @@ Context >> evaluateSignal: exception [
 	| value |
 	exception privHandlerContext: self contextTag.
 	value := self exceptionHandlerBlock cull: exception.	
-	"default return if not otherwise directed in handle block"
-	exception return: value
+	"return from self if not otherwise directed in handle block"
+	self return: value
 ]
 
 { #category : #'special context access' }