runtime: preserve panic owner during rethrow

Author: cpunion

runtime/internal/runtime/z_baremetal.go

@@ -21,7 +21,7 @@ func Rethrow(link *Defer) {
 		c.Printf(c.Str("fatal error\n"))
 		c.Exit(2)
 	} else {
-		if ptr := panicKey.Get(); ptr != nil {
+		if ptr := panicKey.Get(); ptr != nil && link == GetThreadDefer() {
 			node := (*panicNode)(ptr)
 			node.defer_ = link
 		}

runtime/internal/runtime/z_default.go

@@ -27,7 +27,9 @@ func Rethrow(link *Defer) {
 			c.Exit(2)
 		} else {
 			node := (*panicNode)(ptr)
-			node.defer_ = link
+			if link == (*Defer)(c.GoDeferData()) {
+				node.defer_ = link
+			}
 			c.Siglongjmp(link.Addr, 1)
 		}
 	} else if ptr := goexitKey.Get(); ptr != nil {