Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49

pkg/sentry/memmap/BUILD

@@ -1,18 +1,7 @@
 package(licenses = ["notice"])  # Apache 2.0
 
 load("//tools/go_generics:defs.bzl", "go_template_instance")
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
-
-go_stateify(
-    name = "memmap_state",
-    srcs = [
-        "mappable_range.go",
-        "mapping_set.go",
-        "mapping_set_impl.go",
-    ],
-    out = "memmap_state.go",
-    package = "memmap",
-)
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
 
 go_template_instance(
     name = "mappable_range",
@@ -46,7 +35,6 @@ go_library(
         "mapping_set.go",
         "mapping_set_impl.go",
         "memmap.go",
-        "memmap_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/memmap",
     visibility = ["//pkg/sentry:internal"],
@@ -56,7 +44,6 @@ go_library(
         "//pkg/sentry/context",
         "//pkg/sentry/platform",
         "//pkg/sentry/usermem",
-        "//pkg/state",
         "//pkg/syserror",
     ],
 )

pkg/sentry/memmap/mapping_set.go

@@ -35,6 +35,8 @@ import (
 type MappingsOfRange map[MappingOfRange]struct{}
 
 // MappingOfRange represents a mapping of a MappableRange.
+//
+// +stateify savable
 type MappingOfRange struct {
 	MappingSpace MappingSpace
 	AddrRange    usermem.AddrRange