Merge release-20200928.0-66-ga55bd73d4 (automated)

1 files changed, 19 insertions, 19 deletions

diff --git a/pkg/cpuid/cpuid_arm64_state_autogen.go b/pkg/cpuid/cpuid_arm64_state_autogen.go
index 10569802c..656b8d001 100644
--- a/pkg/cpuid/cpuid_arm64_state_autogen.go
+++ b/pkg/cpuid/cpuid_arm64_state_autogen.go
@@ -8,11 +8,11 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *FeatureSet) StateTypeName() string {
+func (f *FeatureSet) StateTypeName() string {
 	return "pkg/cpuid.FeatureSet"
 }
 
-func (x *FeatureSet) StateFields() []string {
+func (f *FeatureSet) StateFields() []string {
 	return []string{
 		"Set",
 		"CPUImplementer",
@@ -23,27 +23,27 @@ func (x *FeatureSet) StateFields() []string {
 	}
 }
 
-func (x *FeatureSet) beforeSave() {}
+func (f *FeatureSet) beforeSave() {}
 
-func (x *FeatureSet) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.Set)
-	m.Save(1, &x.CPUImplementer)
-	m.Save(2, &x.CPUArchitecture)
-	m.Save(3, &x.CPUVariant)
-	m.Save(4, &x.CPUPartnum)
-	m.Save(5, &x.CPURevision)
+func (f *FeatureSet) StateSave(stateSinkObject state.Sink) {
+	f.beforeSave()
+	stateSinkObject.Save(0, &f.Set)
+	stateSinkObject.Save(1, &f.CPUImplementer)
+	stateSinkObject.Save(2, &f.CPUArchitecture)
+	stateSinkObject.Save(3, &f.CPUVariant)
+	stateSinkObject.Save(4, &f.CPUPartnum)
+	stateSinkObject.Save(5, &f.CPURevision)
 }
 
-func (x *FeatureSet) afterLoad() {}
+func (f *FeatureSet) afterLoad() {}
 
-func (x *FeatureSet) StateLoad(m state.Source) {
-	m.Load(0, &x.Set)
-	m.Load(1, &x.CPUImplementer)
-	m.Load(2, &x.CPUArchitecture)
-	m.Load(3, &x.CPUVariant)
-	m.Load(4, &x.CPUPartnum)
-	m.Load(5, &x.CPURevision)
+func (f *FeatureSet) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &f.Set)
+	stateSourceObject.Load(1, &f.CPUImplementer)
+	stateSourceObject.Load(2, &f.CPUArchitecture)
+	stateSourceObject.Load(3, &f.CPUVariant)
+	stateSourceObject.Load(4, &f.CPUPartnum)
+	stateSourceObject.Load(5, &f.CPURevision)
 }
 
 func init() {