Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reduce the need to declare new function when --trap-stdlib #171

Merged
merged 1 commit into from
May 31, 2024
Merged

reduce the need to declare new function when --trap-stdlib #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/xgo/runtime_gen/core/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
)

const VERSION = "1.0.38"
const REVISION = "f197fc6ef0ef40ce20374c7c1469fe36e36a4894+1"
const NUMBER = 247
const REVISION = "d939407b345d1697a3a32cf48c5b659d017c4cff+1"
const NUMBER = 248

// these fields will be filled by compiler
const XGO_VERSION = ""
Expand Down
4 changes: 2 additions & 2 deletions cmd/xgo/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import "fmt"

const VERSION = "1.0.38"
const REVISION = "f197fc6ef0ef40ce20374c7c1469fe36e36a4894+1"
const NUMBER = 247
const REVISION = "d939407b345d1697a3a32cf48c5b659d017c4cff+1"
const NUMBER = 248

func getRevision() string {
revSuffix := ""
Expand Down
281 changes: 144 additions & 137 deletions patch/syntax/rewrite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (

const XgoLinkTrapForGenerated = "__xgo_link_trap_for_generated"

// for closure
// for closures outside stdlib
// why closure needs names?
func fillFuncArgResNames(fileList []*syntax.File) {
if base.Flag.Std {
return
Expand Down Expand Up @@ -117,180 +118,184 @@ func rewriteFuncsSource(funcDecls []*DeclInfo, pkgPath string) {
}
}
fnDecl := fn.FuncDecl
fnType := fnDecl.Type
pos := fn.FuncDecl.Pos()

// check if body contains recover(), if so
// do not add interceptor
// see https://github.com/xhd2015/xgo/issues/164
if hasRecoverCall(fnDecl.Body) {
continue
}

fnName := fnDecl.Name.Value

// dump
// syntax.Fdump(os.Stderr, fn.FuncDecl.Body)
// UPDATE: since we are not declaring new functions,
// recover() is just fine
// if hasRecoverCall(fnDecl.Body) {
// continue
// }

// i
newDecl := copyFuncDeclWithoutBody(fnDecl)
oldFnName := "__xgo_orig_" + fnName
fnDecl.Name.Value = oldFnName

preset := getPresetNames(newDecl)

fillNames(pos, newDecl.Recv, newDecl.Type, preset)
preset := getPresetNames(fnDecl)
if preset[XgoLinkTrapForGenerated] {
// cannot trap
// cannot trap because name conflict
continue
}

// stop if __xgo_link_generated_trap conflict with recv?
fillNames(pos, fnDecl.Recv, fnDecl.Type, preset)
preset[XgoLinkTrapForGenerated] = true

afterV := nextName("_after", "", preset)
stopV := nextName("_stop", "", preset)

idName := fn.IdentityName()

var callOldFunc syntax.Expr
var recvRef syntax.Expr
if newDecl.Recv != nil {
recvName := newDecl.Recv.Name.Value
if fnDecl.Recv != nil {
recvName := fnDecl.Recv.Name.Value
recvRef = &syntax.Operation{
Op: syntax.And,
X: syntax.NewName(pos, recvName),
}
callOldFunc = &syntax.SelectorExpr{
X: syntax.NewName(pos, recvName),
Sel: syntax.NewName(pos, oldFnName),
}
} else {
recvRef = syntax.NewName(pos, "nil")
callOldFunc = syntax.NewName(pos, oldFnName)

// need TParams
tparams := newDecl.TParamList
if len(tparams) > 0 {
tparamExprs := make([]syntax.Expr, len(tparams))
for i, tparam := range tparams {
tparamExprs[i] = syntax.NewName(pos, tparam.Name.Value)
}
var indexExpr syntax.Expr
if len(tparamExprs) == 1 {
indexExpr = tparamExprs[0]
} else {
indexExpr = &syntax.ListExpr{
ElemList: tparamExprs,
}
}
callOldFunc = &syntax.IndexExpr{
X: callOldFunc,
Index: indexExpr,
}
}
}

fnTypeCopy := newDecl.Type
argValues := getRefSlice(pos, fnTypeCopy.ParamList)
argAddrs := getRefAddrSlice(pos, fnTypeCopy.ParamList)
resultAddrs := getRefAddrSlice(pos, fnTypeCopy.ResultList)

var hasDots bool
if len(fnTypeCopy.ParamList) > 0 {
_, hasDots = fnTypeCopy.ParamList[len(fnTypeCopy.ParamList)-1].Type.(*syntax.DotsType)
}
callOldExpr := &syntax.CallExpr{
Fun: callOldFunc,
ArgList: argValues,
HasDots: hasDots,
}
var lastStmt syntax.Stmt
// var lastReturn syntax.Stmt
if len(fnTypeCopy.ResultList) > 0 {
lastStmt = &syntax.ReturnStmt{
Results: callOldExpr,
}
} else {
lastStmt = makeEmptyCallStmt(callOldExpr)
}

newDecl.Body = &syntax.BlockStmt{
Rbrace: pos,
List: []syntax.Stmt{
&syntax.AssignStmt{
Op: syntax.Def,
Lhs: &syntax.ListExpr{
ElemList: []syntax.Expr{
syntax.NewName(pos, afterV),
syntax.NewName(pos, stopV),
},
argAddrs := getRefAddrSlice(pos, fnType.ParamList)
resultAddrs := getRefAddrSlice(pos, fnType.ResultList)

// proto type:
// afterV,stopV := __xgo_link_trap_for_generated(pkgPath,pc=0,identityName, isGeneric, &recv,&args,&results)
// if afterV!=nil{
// defer afterV()
// }
// if stopV {
// return
// }
afterV := nextName("_after", "", preset)
stopV := nextName("_stop", "", preset)
prependStmts := make([]syntax.Stmt, 0, 3+len(fnDecl.Body.List))
prependStmts = append(prependStmts,
&syntax.AssignStmt{
Op: syntax.Def,
Lhs: &syntax.ListExpr{
ElemList: []syntax.Expr{
syntax.NewName(pos, afterV),
syntax.NewName(pos, stopV),
},
Rhs: &syntax.CallExpr{
Fun: syntax.NewName(pos, XgoLinkTrapForGenerated),
ArgList: []syntax.Expr{
newStringLit(pkgPath),
newIntLit(0), // pc, filled by IR
newStringLit(idName),
syntax.NewName(pos, strconv.FormatBool(fn.Generic)),
recvRef,
argAddrs,
resultAddrs,
},
},
Rhs: &syntax.CallExpr{
Fun: syntax.NewName(pos, XgoLinkTrapForGenerated),
ArgList: []syntax.Expr{
newStringLit(pkgPath),
newIntLit(0), // pc, filled by IR
newStringLit(idName),
syntax.NewName(pos, strconv.FormatBool(fn.Generic)),
recvRef,
argAddrs,
resultAddrs,
},
},
},

&syntax.IfStmt{
Cond: &syntax.Operation{
Op: syntax.Neq,
X: syntax.NewName(pos, afterV),
Y: syntax.NewName(pos, "nil"),
},
Then: &syntax.BlockStmt{
List: []syntax.Stmt{
&syntax.CallStmt{
Tok: syntax.Defer,
Call: &syntax.CallExpr{
Fun: syntax.NewName(pos, afterV),
},
&syntax.IfStmt{
Cond: &syntax.Operation{
Op: syntax.Neq,
X: syntax.NewName(pos, afterV),
Y: syntax.NewName(pos, "nil"),
},
Then: &syntax.BlockStmt{
List: []syntax.Stmt{
&syntax.CallStmt{
Tok: syntax.Defer,
Call: &syntax.CallExpr{
Fun: syntax.NewName(pos, afterV),
},
},
},
},
// debug
// &syntax.AssignStmt{
// Lhs: &syntax.ListExpr{
// ElemList: []syntax.Expr{
// syntax.NewName(pos, "_"),
// syntax.NewName(pos, "_"),
// },
// },
// Rhs: &syntax.ListExpr{
// ElemList: []syntax.Expr{
// syntax.NewName(pos, afterV),
// syntax.NewName(pos, stopV),
// },
// },
// },
&syntax.IfStmt{
Cond: syntax.NewName(pos, stopV),
Then: &syntax.BlockStmt{
List: []syntax.Stmt{
&syntax.ReturnStmt{},
},
Rbrace: pos,
},
// debug
// &syntax.AssignStmt{
// Lhs: &syntax.ListExpr{
// ElemList: []syntax.Expr{
// syntax.NewName(pos, "_"),
// syntax.NewName(pos, "_"),
// },
// },
// Rhs: &syntax.ListExpr{
// ElemList: []syntax.Expr{
// syntax.NewName(pos, afterV),
// syntax.NewName(pos, stopV),
// },
// },
// },
&syntax.IfStmt{
Cond: syntax.NewName(pos, stopV),
Then: &syntax.BlockStmt{
List: []syntax.Stmt{
&syntax.ReturnStmt{},
},
Rbrace: pos,
},
lastStmt,
},
)
for _, p := range prependStmts {
fillPos(pos, p)
}
fillPos(pos, newDecl)
fn.FileSyntax.DeclList = append(fn.FileSyntax.DeclList, newDecl)

fnDecl.Body.List = append(prependStmts, fnDecl.Body.List...)
if false {
// debug
syntax.Fdump(os.Stderr, newDecl)
syntax.Fdump(os.Stderr, fnDecl)
}
}
}

func makeCallToOldFuncStmt(pos syntax.Pos, fnDecl *syntax.FuncDecl, oldFnName string) syntax.Stmt {
var callOldFunc syntax.Expr
if fnDecl.Recv != nil {
recvName := fnDecl.Recv.Name.Value
callOldFunc = &syntax.SelectorExpr{
X: syntax.NewName(pos, recvName),
Sel: syntax.NewName(pos, oldFnName),
}
} else {
callOldFunc = syntax.NewName(pos, oldFnName)

// need TParams
tparams := fnDecl.TParamList
if len(tparams) > 0 {
tparamExprs := make([]syntax.Expr, len(tparams))
for i, tparam := range tparams {
tparamExprs[i] = syntax.NewName(pos, tparam.Name.Value)
}
var indexExpr syntax.Expr
if len(tparamExprs) == 1 {
indexExpr = tparamExprs[0]
} else {
indexExpr = &syntax.ListExpr{
ElemList: tparamExprs,
}
}
callOldFunc = &syntax.IndexExpr{
X: callOldFunc,
Index: indexExpr,
}
}
}

fnTypeCopy := fnDecl.Type
argValues := getRefSlice(pos, fnTypeCopy.ParamList)

var hasDots bool
if len(fnTypeCopy.ParamList) > 0 {
_, hasDots = fnTypeCopy.ParamList[len(fnTypeCopy.ParamList)-1].Type.(*syntax.DotsType)
}
callOldExpr := &syntax.CallExpr{
Fun: callOldFunc,
ArgList: argValues,
HasDots: hasDots,
}
var stmt syntax.Stmt
// var lastReturn syntax.Stmt
if len(fnTypeCopy.ResultList) > 0 {
stmt = &syntax.ReturnStmt{
Results: callOldExpr,
}
} else {
stmt = makeEmptyCallStmt(callOldExpr)
}
return stmt
}

func makeEmptyCallStmt(callExpr *syntax.CallExpr) syntax.Stmt {
Expand All @@ -313,6 +318,8 @@ func fillPos(pos syntax.Pos, node syntax.Node) {
})

}

// auto fill unnamed parameters
func fillNames(pos syntax.Pos, recv *syntax.Field, funcType *syntax.FuncType, preset map[string]bool) {
if recv != nil {
fillFieldNames(pos, []*syntax.Field{recv}, preset, "_x")
Expand Down
4 changes: 2 additions & 2 deletions runtime/core/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
)

const VERSION = "1.0.38"
const REVISION = "f197fc6ef0ef40ce20374c7c1469fe36e36a4894+1"
const NUMBER = 247
const REVISION = "d939407b345d1697a3a32cf48c5b659d017c4cff+1"
const NUMBER = 248

// these fields will be filled by compiler
const XGO_VERSION = ""
Expand Down
2 changes: 1 addition & 1 deletion runtime/mock/stdlib.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ There are two modes for mocking stdlib functions,
1. Default-Allow Mode
2. Default-Disallow Mode

These two modes can be switched by `--trap-stdlib` and `--trap-stdlib=false`.
These two modes can be switched between `--trap-stdlib` and `--trap-stdlib=false`.

When running `xgo test`, `--trap-stdlib` is assumed, you can turn it off with `--trap-stdlib=false`.

Expand Down
Loading