cmd/internal/objabi, runtime: compact FUNCDATA indices

As we deleted register maps, move FUNCDATA indices of stack
objects, inline trees, and open-coded defers earlier.

Change-Id: If73797b8c11fd207655c9498802fca9f6f9ac338
Reviewed-on: https://go-review.googlesource.com/c/go/+/265761
Trust: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Austin Clements <austin@google.com>

diff --git a/src/cmd/internal/objabi/funcdata.go b/src/cmd/internal/objabi/funcdata.go
index 1c5e5e1c8c447464cb8515caccce767b976db3ce..faa2863325d1ee79ea50da42e88edb324e2c44a2 100644 (file)
--- a/src/cmd/internal/objabi/funcdata.go
+++ b/src/cmd/internal/objabi/funcdata.go
@@ -17,9 +17,9 @@ const (
 
        FUNCDATA_ArgsPointerMaps    = 0
        FUNCDATA_LocalsPointerMaps  = 1
-       FUNCDATA_StackObjects       = 3
-       FUNCDATA_InlTree            = 4
-       FUNCDATA_OpenCodedDeferInfo = 5
+       FUNCDATA_StackObjects       = 2
+       FUNCDATA_InlTree            = 3
+       FUNCDATA_OpenCodedDeferInfo = 4
 
        // ArgsSizeUnknown is set in Func.argsize to mark all functions
        // whose argument size is unknown (C vararg functions, and

diff --git a/src/runtime/funcdata.h b/src/runtime/funcdata.h
index e9b6a7ed06e42e516da8794d4920ab19d2b12b34..798dbaceabfefa1205a7cc57a17f2e3f7d8f76c3 100644 (file)
--- a/src/runtime/funcdata.h
+++ b/src/runtime/funcdata.h
@@ -14,9 +14,9 @@
 
 #define FUNCDATA_ArgsPointerMaps 0 /* garbage collector blocks */
 #define FUNCDATA_LocalsPointerMaps 1
-#define FUNCDATA_StackObjects 3
-#define FUNCDATA_InlTree 4
-#define FUNCDATA_OpenCodedDeferInfo 5 /* info for func with open-coded defers */
+#define FUNCDATA_StackObjects 2
+#define FUNCDATA_InlTree 3
+#define FUNCDATA_OpenCodedDeferInfo 4 /* info for func with open-coded defers */
 
 // Pseudo-assembly statements.
 

diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go
index a4b4344ea7cde88f633bf361108f557da94422d6..7667f23f1dba734fae6d4bbbe9f5837d383be6c0 100644 (file)
--- a/src/runtime/symtab.go
+++ b/src/runtime/symtab.go
@@ -274,9 +274,9 @@ const (
 
        _FUNCDATA_ArgsPointerMaps    = 0
        _FUNCDATA_LocalsPointerMaps  = 1
-       _FUNCDATA_StackObjects       = 3
-       _FUNCDATA_InlTree            = 4
-       _FUNCDATA_OpenCodedDeferInfo = 5
+       _FUNCDATA_StackObjects       = 2
+       _FUNCDATA_InlTree            = 3
+       _FUNCDATA_OpenCodedDeferInfo = 4
 
        _ArgsSizeUnknown = -0x80000000
 )