fix runtime.Goexit()

neelance · neelance · commit d6f494cb30ea · 2016-01-23T21:05:54.000+01:00
diff --git a/compiler/prelude/goroutines.go b/compiler/prelude/goroutines.go
@@ -129,6 +129,9 @@ var $go = function(fun, args, direct) {
       }
       $goroutine.exit = true;
     } catch (err) {
+      if ($goroutine.exit) {
+        return;
+      }
       $goroutine.exit = true;
       throw err;
     } finally {
diff --git a/tests/misc_test.go b/tests/misc_test.go
@@ -496,3 +496,9 @@ func TestBoolConvert(t *testing.T) {
 		t.Fail()
 	}
 }
+
+func TestGoexit(t *testing.T) {
+	go func() {
+		runtime.Goexit()
+	}()
+}

Original file line number	Diff line number	Diff line change
`@@ -496,3 +496,9 @@ func TestBoolConvert(t *testing.T) {`
`496`	`496`	`t.Fail()`
`497`	`497`	`}`
`498`	`498`	`}`
	`499`	`+`
	`500`	`+func TestGoexit(t *testing.T) {`
	`501`	`+ go func() {`
	`502`	`+ runtime.Goexit()`
	`503`	`+ }()`
	`504`	`+}`