support go local

golang · Sep 12, 2024 · 9b57c75 · 9b57c75
1 parent dbecb41
commit 9b57c75
Show file tree

Hide file tree

Showing 25 changed files with 405 additions and 174 deletions.
diff --git a/src/cmd/compile/internal/escape/stmt.go b/src/cmd/compile/internal/escape/stmt.go
@@ -48,6 +48,22 @@ func (e *escape) stmt(n ir.Node) {
 			e.dcl(n.X)
 		}
 
+	case ir.ODCLGOLOCAL:
+		// Record loop depth at declaration.
+		n := n.(*ir.Decl)
+		if !ir.IsBlank(n.X) {
+			e.dcl(n.X)
+			// GoLocal variables must be escape
+			loc := e.oldLoc(n.X)
+			loc.attrs |= attrEscapes
+		}
+
+	case ir.ODCLGOLOCALALLOC:
+		n := n.(*ir.Decl)
+		if !ir.IsBlank(n.X) {
+			e.dcl(n.X)
+		}
+
 	case ir.OLABEL:
 		n := n.(*ir.LabelStmt)
 		if n.Label.IsBlank() {

diff --git a/src/cmd/compile/internal/ir/go_local_map.go b/src/cmd/compile/internal/ir/go_local_map.go
@@ -0,0 +1,14 @@
+package ir
+
+// goLocalInitMap is mapping need init virtual variable to its go_local variable.
+var goLocalInitMap = map[*Name]*Name{}
+
+// BindGoLocalInit records need init virtual variable and its go_local variable.
+func BindGoLocalInit(goLocal, needInit *Name) {
+	goLocalInitMap[needInit] = goLocal
+}
+
+// GetGoLocalByInit gets go_local variable for need init virtual variable.
+func GetGoLocalByInit(needInit *Name) *Name {
+	return goLocalInitMap[needInit]
+}
diff --git a/src/cmd/compile/internal/ir/node.go b/src/cmd/compile/internal/ir/node.go
@@ -173,6 +173,12 @@ const (
 	OCOPY      // copy(X, Y)
 	ODCL       // var X (declares X of type X.Type)
 
+	// ODCLGOLOCAL: go_local X (declares go local X of type X.Type).
+	// ODCLGOLOCALALLOC: go local alloc, this define a virtual variable
+	// recording if alloc new mem for go_local variable.
+	ODCLGOLOCAL
+	ODCLGOLOCALALLOC
+
 	// Used during parsing but don't last.
 	ODCLFUNC // func f() or func (r) f()
 

diff --git a/src/cmd/compile/internal/ir/op_string.go b/src/cmd/compile/internal/ir/op_string.go
diff --git a/src/cmd/compile/internal/ir/stmt.go b/src/cmd/compile/internal/ir/stmt.go
@@ -24,7 +24,7 @@ func NewDecl(pos src.XPos, op Op, x *Name) *Decl {
 	switch op {
 	default:
 		panic("invalid Decl op " + op.String())
-	case ODCL:
+	case ODCL, ODCLGOLOCAL, ODCLGOLOCALALLOC:
 		n.op = op
 	}
 	return n

diff --git a/src/cmd/compile/internal/ir/symtab.go b/src/cmd/compile/internal/ir/symtab.go
@@ -13,46 +13,48 @@ import (
 var Syms symsStruct
 
 type symsStruct struct {
-	AssertE2I         *obj.LSym
-	AssertE2I2        *obj.LSym
-	AssertI2I         *obj.LSym
-	AssertI2I2        *obj.LSym
-	Asanread          *obj.LSym
-	Asanwrite         *obj.LSym
-	CgoCheckMemmove   *obj.LSym
-	CgoCheckPtrWrite  *obj.LSym
-	CheckPtrAlignment *obj.LSym
-	Deferproc         *obj.LSym
-	Deferprocat       *obj.LSym
-	DeferprocStack    *obj.LSym
-	Deferreturn       *obj.LSym
-	Duffcopy          *obj.LSym
-	Duffzero          *obj.LSym
-	GCWriteBarrier    [8]*obj.LSym
-	Goschedguarded    *obj.LSym
-	Growslice         *obj.LSym
-	InterfaceSwitch   *obj.LSym
-	Memmove           *obj.LSym
-	Msanread          *obj.LSym
-	Msanwrite         *obj.LSym
-	Msanmove          *obj.LSym
-	Newobject         *obj.LSym
-	Newproc           *obj.LSym
-	Panicdivide       *obj.LSym
-	Panicshift        *obj.LSym
-	PanicdottypeE     *obj.LSym
-	PanicdottypeI     *obj.LSym
-	Panicnildottype   *obj.LSym
-	Panicoverflow     *obj.LSym
-	Racefuncenter     *obj.LSym
-	Racefuncexit      *obj.LSym
-	Raceread          *obj.LSym
-	Racereadrange     *obj.LSym
-	Racewrite         *obj.LSym
-	Racewriterange    *obj.LSym
-	TypeAssert        *obj.LSym
-	WBZero            *obj.LSym
-	WBMove            *obj.LSym
+	AssertE2I                    *obj.LSym
+	AssertE2I2                   *obj.LSym
+	AssertI2I                    *obj.LSym
+	AssertI2I2                   *obj.LSym
+	Asanread                     *obj.LSym
+	Asanwrite                    *obj.LSym
+	CgoCheckMemmove              *obj.LSym
+	CgoCheckPtrWrite             *obj.LSym
+	CheckPtrAlignment            *obj.LSym
+	Deferproc                    *obj.LSym
+	Deferprocat                  *obj.LSym
+	DeferprocStack               *obj.LSym
+	Deferreturn                  *obj.LSym
+	Duffcopy                     *obj.LSym
+	Duffzero                     *obj.LSym
+	GCWriteBarrier               [8]*obj.LSym
+	Goschedguarded               *obj.LSym
+	Growslice                    *obj.LSym
+	InterfaceSwitch              *obj.LSym
+	Memmove                      *obj.LSym
+	Msanread                     *obj.LSym
+	Msanwrite                    *obj.LSym
+	Msanmove                     *obj.LSym
+	Newobject                    *obj.LSym
+	NewGoLocalObject             *obj.LSym
+	NewGoLocalObjectForStringKey *obj.LSym
+	Newproc                      *obj.LSym
+	Panicdivide                  *obj.LSym
+	Panicshift                   *obj.LSym
+	PanicdottypeE                *obj.LSym
+	PanicdottypeI                *obj.LSym
+	Panicnildottype              *obj.LSym
+	Panicoverflow                *obj.LSym
+	Racefuncenter                *obj.LSym
+	Racefuncexit                 *obj.LSym
+	Raceread                     *obj.LSym
+	Racereadrange                *obj.LSym
+	Racewrite                    *obj.LSym
+	Racewriterange               *obj.LSym
+	TypeAssert                   *obj.LSym
+	WBZero                       *obj.LSym
+	WBMove                       *obj.LSym
 	// Wasm
 	SigPanic        *obj.LSym
 	Staticuint64s   *obj.LSym

diff --git a/src/cmd/compile/internal/noder/codes.go b/src/cmd/compile/internal/noder/codes.go
@@ -20,6 +20,7 @@ const (
 	stmtSend
 	stmtAssign
 	stmtAssignOp
+	stmtGoLocalAssign
 	stmtIncDec
 	stmtBranch
 	stmtCall