fix trace marshal

cmd/xgo/runtime_gen/trace/trace.go

@@ -181,6 +181,7 @@ func (c *collectOpts) WithFilter(f func(stack *Stack) bool) *collectOpts {
 	c.filter = append(c.filter, f)
 	return c
 }
+
 func (c *collectOpts) WithOptions(opts *CollectOptions) *collectOpts {
 	c.options = opts
 	return c

cmd/xgo/version.go

@@ -4,8 +4,8 @@ import "fmt"
 
 // auto updated
 const VERSION = "1.0.46"
-const REVISION = "f6841ef832f77218084fcba9af395cce5705fff9+1"
-const NUMBER = 298
+const REVISION = "baec4d50e4c26d279fe32cd30c7649d707b8f1ce+1"
+const NUMBER = 299
 
 // manually updated
 const CORE_VERSION = "1.0.43"

patch/ctxt/ctx.go

@@ -65,6 +65,17 @@ func SkipPackageTrap() bool {
 	return false
 }
 
+// always trap for encoding/json.newTypeEncoder
+func AlwaysTrap(pkgPath string, isStd bool, identityName string, funcName string) bool {
+	if !isStd {
+		return false
+	}
+	if pkgPath == "encoding/json" && identityName == "newTypeEncoder" {
+		return true
+	}
+	return false
+}
+
 func AllowPkgFuncTrap(pkgPath string, isStd bool, identityName string, funcName string) bool {
 	if isStd {
 		return allowStdFunc(pkgPath, identityName, funcName)

patch/syntax/syntax.go

@@ -574,13 +574,20 @@ func filterFuncDecls(funcDecls []*info.DeclInfo, pkgPath string) []*info.DeclInf
 	for j := 0; j < n; j++ {
 		fn := funcDecls[j]
 
-		action := xgo_ctxt.GetAction(fn)
-		if action == "" {
-			// disable part of stdlibs
-			if !xgo_ctxt.AllowPkgFuncTrap(pkgPath, base.Flag.Std, fn.IdentityName(), fn.FuncName()) {
-				action = "exclude"
+		var action string
+
+		idName := fn.IdentityName()
+		funcName := fn.FuncName()
+		if !xgo_ctxt.AlwaysTrap(pkgPath, base.Flag.Std, idName, funcName) {
+			action = xgo_ctxt.GetAction(fn)
+			if action == "" {
+				// disable part of stdlibs
+				if !xgo_ctxt.AllowPkgFuncTrap(pkgPath, base.Flag.Std, idName, funcName) {
+					action = "exclude"
+				}
 			}
 		}
+
 		if action == "" || action == "include" {
 			funcDecls[i] = fn
 			i++

runtime/test/trace/marshal/exclude/func_even_action_exclude_test.go

@@ -0,0 +1,28 @@
+package marshal
+
+import (
+	"testing"
+
+	"github.com/xhd2015/xgo/runtime/trace"
+)
+
+// go run -tags dev ./cmd/xgo test --project-dir runtime/test/trace/marshal/exclue --mock-rule='{"pkg":"encoding/json","name":"newTypeEncoder","action":"exclude"}' -run TestMarshalFuncEvenActionExclude
+
+// flag: --mock-rule='{"pkg":"encoding/json","name":"newTypeEncoder","action":"exclude"}'
+func TestMarshalFuncEvenActionExclude(t *testing.T) {
+	data, err := trace.MarshalAnyJSON(map[string]interface{}{
+		"test": test,
+	})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	expect := `{"test":{}}`
+	if string(data) != expect {
+		t.Errorf("expect: %s, actual: %s", expect, string(data))
+	}
+}
+
+func test() {
+
+}

runtime/test/trace/marshal/flag/func_even_stdlib_is_false_test.go

@@ -0,0 +1,26 @@
+package marshal
+
+import (
+	"testing"
+
+	"github.com/xhd2015/xgo/runtime/trace"
+)
+
+// flag: --trap-stdlib=false
+func TestMarshalFuncEvenStdlibIsFalse(t *testing.T) {
+	data, err := trace.MarshalAnyJSON(map[string]interface{}{
+		"test": test,
+	})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	expect := `{"test":{}}`
+	if string(data) != expect {
+		t.Errorf("expect: %s, actual: %s", expect, string(data))
+	}
+}
+
+func test() {
+
+}

runtime/trace/trace.go

@@ -181,6 +181,7 @@ func (c *collectOpts) WithFilter(f func(stack *Stack) bool) *collectOpts {
 	c.filter = append(c.filter, f)
 	return c
 }
+
 func (c *collectOpts) WithOptions(opts *CollectOptions) *collectOpts {
 	c.options = opts
 	return c

script/run-test/main.go

@@ -167,6 +167,17 @@ var extraSubTests = []*TestCase{
 		usePlainGo: true,
 		dir:        "test/xgo_integration",
 	},
+	{
+		// go run ./script/run-test/ --name trace-marshal-not-trap-stdlib
+		name:  "trace-marshal-not-trap-stdlib",
+		dir:   "runtime/test/trace/marshal/flag",
+		flags: []string{"--trap-stdlib=false"},
+	},
+	{
+		name:  "trace-marshal-exclude",
+		dir:   "runtime/test/trace/marshal/exclude",
+		flags: []string{"--mock-rule", `{"pkg":"encoding/json","name":"newTypeEncoder","action":"exclude"}`},
+	},
 }
 
 func main() {

support/assert/diff.go

@@ -106,9 +106,6 @@ func diffText(expected []byte, actual []byte) (string, error) {
 	}
 	defer os.RemoveAll(tmpDir)
 
-	// var jsonExpected []byte
-	// var jsonActual []byte
-
 	err = fileutil.WriteFile(filepath.Join(tmpDir, "expected"), expected)
 	if err != nil {
 		return "", err