Remove unused flag is_zygote flag from ImageSpace.
Bug: 169925964
Test: cd art && mma
Change-Id: I5f69a6d3fb3fe2fec5b32b0ae91c00ccbcabedf0
diff --git a/dex2oat/dex2oat_image_test.cc b/dex2oat/dex2oat_image_test.cc
index 62d0e83..20841f7 100644
--- a/dex2oat/dex2oat_image_test.cc
+++ b/dex2oat/dex2oat_image_test.cc
@@ -426,7 +426,6 @@
kRuntimeISA,
relocate,
/*executable=*/ true,
- /*is_zygote=*/ false,
/*extra_reservation_size=*/ 0u,
&boot_image_spaces,
&extra_reservation);
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 6fdc4e4..4a03e61 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -420,7 +420,6 @@
image_instruction_set,
runtime->ShouldRelocate(),
/*executable=*/ !runtime->IsAotCompiler(),
- is_zygote,
heap_reservation_size,
&boot_image_spaces,
&heap_reservation)) {
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index f84cf50..1dee6a6 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -2220,20 +2220,16 @@
const std::string& image_location,
InstructionSet image_isa,
bool relocate,
- bool executable,
- bool is_zygote)
+ bool executable)
: boot_class_path_(boot_class_path),
boot_class_path_locations_(boot_class_path_locations),
image_location_(image_location),
image_isa_(image_isa),
relocate_(relocate),
executable_(executable),
- is_zygote_(is_zygote),
has_system_(false) {
}
- bool IsZygote() const { return is_zygote_; }
-
void FindImageFiles() {
BootImageLayout layout(image_location_, boot_class_path_, boot_class_path_locations_);
std::string image_location = layout.GetPrimaryImageLocation();
@@ -3097,7 +3093,6 @@
const InstructionSet image_isa_;
const bool relocate_;
const bool executable_;
- const bool is_zygote_;
bool has_system_;
};
@@ -3161,7 +3156,6 @@
const InstructionSet image_isa,
bool relocate,
bool executable,
- bool is_zygote,
size_t extra_reservation_size,
/*out*/std::vector<std::unique_ptr<ImageSpace>>* boot_image_spaces,
/*out*/MemMap* extra_reservation) {
@@ -3182,8 +3176,7 @@
image_location,
image_isa,
relocate,
- executable,
- is_zygote);
+ executable);
loader.FindImageFiles();
// Collect all the errors.
diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h
index 0a706b8..545f659 100644
--- a/runtime/gc/space/image_space.h
+++ b/runtime/gc/space/image_space.h
@@ -128,7 +128,6 @@
const InstructionSet image_isa,
bool relocate,
bool executable,
- bool is_zygote,
size_t extra_reservation_size,
/*out*/std::vector<std::unique_ptr<ImageSpace>>* boot_image_spaces,
/*out*/MemMap* extra_reservation) REQUIRES_SHARED(Locks::mutator_lock_);
diff --git a/runtime/gc/space/image_space_test.cc b/runtime/gc/space/image_space_test.cc
index 25f2198..6208a73 100644
--- a/runtime/gc/space/image_space_test.cc
+++ b/runtime/gc/space/image_space_test.cc
@@ -140,7 +140,6 @@
kRuntimeISA,
/*relocate=*/ false,
/*executable=*/ true,
- /*is_zygote=*/ false,
/*extra_reservation_size=*/ 0u,
&boot_image_spaces,
&extra_reservation);