Merge release-20200928.0-66-ga55bd73d4 (automated)

1 files changed, 44 insertions, 44 deletions

diff --git a/pkg/waiter/waiter_state_autogen.go b/pkg/waiter/waiter_state_autogen.go
index 2a2321a67..8110a621c 100644
--- a/pkg/waiter/waiter_state_autogen.go
+++ b/pkg/waiter/waiter_state_autogen.go
@@ -6,11 +6,11 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *Entry) StateTypeName() string {
+func (e *Entry) StateTypeName() string {
 	return "pkg/waiter.Entry"
 }
 
-func (x *Entry) StateFields() []string {
+func (e *Entry) StateFields() []string {
 	return []string{
 		"Callback",
 		"mask",
@@ -18,95 +18,95 @@ func (x *Entry) StateFields() []string {
 	}
 }
 
-func (x *Entry) beforeSave() {}
+func (e *Entry) beforeSave() {}
 
-func (x *Entry) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.Callback)
-	m.Save(1, &x.mask)
-	m.Save(2, &x.waiterEntry)
+func (e *Entry) StateSave(stateSinkObject state.Sink) {
+	e.beforeSave()
+	stateSinkObject.Save(0, &e.Callback)
+	stateSinkObject.Save(1, &e.mask)
+	stateSinkObject.Save(2, &e.waiterEntry)
 }
 
-func (x *Entry) afterLoad() {}
+func (e *Entry) afterLoad() {}
 
-func (x *Entry) StateLoad(m state.Source) {
-	m.Load(0, &x.Callback)
-	m.Load(1, &x.mask)
-	m.Load(2, &x.waiterEntry)
+func (e *Entry) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &e.Callback)
+	stateSourceObject.Load(1, &e.mask)
+	stateSourceObject.Load(2, &e.waiterEntry)
 }
 
-func (x *Queue) StateTypeName() string {
+func (q *Queue) StateTypeName() string {
 	return "pkg/waiter.Queue"
 }
 
-func (x *Queue) StateFields() []string {
+func (q *Queue) StateFields() []string {
 	return []string{}
 }
 
-func (x *Queue) beforeSave() {}
+func (q *Queue) beforeSave() {}
 
-func (x *Queue) StateSave(m state.Sink) {
-	x.beforeSave()
-	if !state.IsZeroValue(&x.list) {
-		state.Failf("list is %#v, expected zero", &x.list)
+func (q *Queue) StateSave(stateSinkObject state.Sink) {
+	q.beforeSave()
+	if !state.IsZeroValue(&q.list) {
+		state.Failf("list is %#v, expected zero", &q.list)
 	}
 }
 
-func (x *Queue) afterLoad() {}
+func (q *Queue) afterLoad() {}
 
-func (x *Queue) StateLoad(m state.Source) {
+func (q *Queue) StateLoad(stateSourceObject state.Source) {
 }
 
-func (x *waiterList) StateTypeName() string {
+func (w *waiterList) StateTypeName() string {
 	return "pkg/waiter.waiterList"
 }
 
-func (x *waiterList) StateFields() []string {
+func (w *waiterList) StateFields() []string {
 	return []string{
 		"head",
 		"tail",
 	}
 }
 
-func (x *waiterList) beforeSave() {}
+func (w *waiterList) beforeSave() {}
 
-func (x *waiterList) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.head)
-	m.Save(1, &x.tail)
+func (w *waiterList) StateSave(stateSinkObject state.Sink) {
+	w.beforeSave()
+	stateSinkObject.Save(0, &w.head)
+	stateSinkObject.Save(1, &w.tail)
 }
 
-func (x *waiterList) afterLoad() {}
+func (w *waiterList) afterLoad() {}
 
-func (x *waiterList) StateLoad(m state.Source) {
-	m.Load(0, &x.head)
-	m.Load(1, &x.tail)
+func (w *waiterList) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &w.head)
+	stateSourceObject.Load(1, &w.tail)
 }
 
-func (x *waiterEntry) StateTypeName() string {
+func (w *waiterEntry) StateTypeName() string {
 	return "pkg/waiter.waiterEntry"
 }
 
-func (x *waiterEntry) StateFields() []string {
+func (w *waiterEntry) StateFields() []string {
 	return []string{
 		"next",
 		"prev",
 	}
 }
 
-func (x *waiterEntry) beforeSave() {}
+func (w *waiterEntry) beforeSave() {}
 
-func (x *waiterEntry) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.next)
-	m.Save(1, &x.prev)
+func (w *waiterEntry) StateSave(stateSinkObject state.Sink) {
+	w.beforeSave()
+	stateSinkObject.Save(0, &w.next)
+	stateSinkObject.Save(1, &w.prev)
 }
 
-func (x *waiterEntry) afterLoad() {}
+func (w *waiterEntry) afterLoad() {}
 
-func (x *waiterEntry) StateLoad(m state.Source) {
-	m.Load(0, &x.next)
-	m.Load(1, &x.prev)
+func (w *waiterEntry) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &w.next)
+	stateSourceObject.Load(1, &w.prev)
 }
 
 func init() {