Merge release-20200211.0-58-gf1b7275 (automated)

3 files changed, 24 insertions, 24 deletions

diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go
index 82f1100cc..59290f5a0 100755
--- a/pkg/abi/linux/linux_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go
@@ -37,15 +37,15 @@ func (r *RSeqCriticalSection) MarshalBytes(dst []byte) {
 
 // UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes.
 func (r *RSeqCriticalSection) UnmarshalBytes(src []byte) {
-    r.Version = usermem.ByteOrder.Uint32(src[:4])
+    r.Version = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    r.Flags = usermem.ByteOrder.Uint32(src[:4])
+    r.Flags = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    r.Start = usermem.ByteOrder.Uint64(src[:8])
+    r.Start = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
-    r.PostCommitOffset = usermem.ByteOrder.Uint64(src[:8])
+    r.PostCommitOffset = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
-    r.Abort = usermem.ByteOrder.Uint64(src[:8])
+    r.Abort = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
 }
 
diff --git a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go
index cefe4941a..6abfea58c 100755
--- a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go
@@ -62,21 +62,21 @@ func (s *Stat) MarshalBytes(dst []byte) {
 
 // UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes.
 func (s *Stat) UnmarshalBytes(src []byte) {
-    s.Dev = usermem.ByteOrder.Uint64(src[:8])
+    s.Dev = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
-    s.Ino = usermem.ByteOrder.Uint64(src[:8])
+    s.Ino = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
-    s.Nlink = usermem.ByteOrder.Uint64(src[:8])
+    s.Nlink = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
-    s.Mode = usermem.ByteOrder.Uint32(src[:4])
+    s.Mode = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    s.UID = usermem.ByteOrder.Uint32(src[:4])
+    s.UID = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    s.GID = usermem.ByteOrder.Uint32(src[:4])
+    s.GID = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
     // Padding: var _ int32 ~= src[:sizeof(int32)]
     src = src[4:]
-    s.Rdev = usermem.ByteOrder.Uint64(src[:8])
+    s.Rdev = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
     s.Size = int64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
@@ -101,7 +101,7 @@ func (s *Stat) Packed() bool {
 
 // MarshalUnsafe implements marshal.Marshallable.MarshalUnsafe.
 func (s *Stat) MarshalUnsafe(dst []byte) {
-    if s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() {
+    if s.MTime.Packed() && s.CTime.Packed() && s.ATime.Packed() {
         safecopy.CopyIn(dst, unsafe.Pointer(s))
     } else {
         s.MarshalBytes(dst)
@@ -119,7 +119,7 @@ func (s *Stat) UnmarshalUnsafe(src []byte) {
 
 // CopyOut implements marshal.Marshallable.CopyOut.
 func (s *Stat) CopyOut(task marshal.Task, addr usermem.Addr) error {
-    if !s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() {
+    if !s.CTime.Packed() && s.ATime.Packed() && s.MTime.Packed() {
         // Type Stat doesn't have a packed layout in memory, fall back to MarshalBytes.
         buf := task.CopyScratchBuffer(s.SizeBytes())
         s.MarshalBytes(buf)
@@ -184,7 +184,7 @@ func (s *Stat) CopyIn(task marshal.Task, addr usermem.Addr) error {
 
 // WriteTo implements io.WriterTo.WriteTo.
 func (s *Stat) WriteTo(w io.Writer) (int64, error) {
-    if !s.CTime.Packed() && s.ATime.Packed() && s.MTime.Packed() {
+    if !s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() {
         // Type Stat doesn't have a packed layout in memory, fall back to MarshalBytes.
         buf := make([]byte, s.SizeBytes())
         s.MarshalBytes(buf)
diff --git a/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go
index 83d655d30..d57e8e48d 100755
--- a/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go
@@ -64,19 +64,19 @@ func (s *Stat) MarshalBytes(dst []byte) {
 
 // UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes.
 func (s *Stat) UnmarshalBytes(src []byte) {
-    s.Dev = usermem.ByteOrder.Uint64(src[:8])
+    s.Dev = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
-    s.Ino = usermem.ByteOrder.Uint64(src[:8])
+    s.Ino = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
-    s.Mode = usermem.ByteOrder.Uint32(src[:4])
+    s.Mode = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    s.Nlink = usermem.ByteOrder.Uint32(src[:4])
+    s.Nlink = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    s.UID = usermem.ByteOrder.Uint32(src[:4])
+    s.UID = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    s.GID = usermem.ByteOrder.Uint32(src[:4])
+    s.GID = uint32(usermem.ByteOrder.Uint32(src[:4]))
     src = src[4:]
-    s.Rdev = usermem.ByteOrder.Uint64(src[:8])
+    s.Rdev = uint64(usermem.ByteOrder.Uint64(src[:8]))
     src = src[8:]
     // Padding: var _ uint64 ~= src[:sizeof(uint64)]
     src = src[8:]
@@ -105,7 +105,7 @@ func (s *Stat) Packed() bool {
 
 // MarshalUnsafe implements marshal.Marshallable.MarshalUnsafe.
 func (s *Stat) MarshalUnsafe(dst []byte) {
-    if s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() {
+    if s.MTime.Packed() && s.CTime.Packed() && s.ATime.Packed() {
         safecopy.CopyIn(dst, unsafe.Pointer(s))
     } else {
         s.MarshalBytes(dst)
@@ -123,7 +123,7 @@ func (s *Stat) UnmarshalUnsafe(src []byte) {
 
 // CopyOut implements marshal.Marshallable.CopyOut.
 func (s *Stat) CopyOut(task marshal.Task, addr usermem.Addr) error {
-    if !s.CTime.Packed() && s.ATime.Packed() && s.MTime.Packed() {
+    if !s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() {
         // Type Stat doesn't have a packed layout in memory, fall back to MarshalBytes.
         buf := task.CopyScratchBuffer(s.SizeBytes())
         s.MarshalBytes(buf)