Get rid of shadow maps for images
Fixed the image bitmap creation to use the End of the object section
instead of using the map size. This means that the bitmap covers at
most one word of bits past the end of the object section.
Reverts shadow map logic introduced by multi image CL:
(commit dcdc85bbd569f0ee66c331b4219c19304a616214)
Bug: 26317072
Change-Id: I181cf3490a5b292c00c6b0f97536f3206adcd091
diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h
index b8ae4a0..9c8e8b2 100644
--- a/runtime/gc/space/image_space.h
+++ b/runtime/gc/space/image_space.h
@@ -171,8 +171,7 @@
const char* image_location,
MemMap* mem_map,
accounting::ContinuousSpaceBitmap* live_bitmap,
- uint8_t* end,
- MemMap* shadow_map = nullptr);
+ uint8_t* end);
// The OatFile associated with the image during early startup to
// reserve space contiguous to the image. It is later released to
@@ -185,10 +184,6 @@
const std::string image_location_;
- // A MemMap reserving the space of the bitmap "shadow," so that we don't allocate into it. Only
- // used in the multi-image case.
- std::unique_ptr<MemMap> shadow_map_;
-
private:
DISALLOW_COPY_AND_ASSIGN(ImageSpace);
};