Revert "Store resolved Strings for AOT code in .bss."
There are some issues with oat_test64 on host and aosp_mips-eng.
Also reverts "compiler_driver: Fix build."
Bug: 20323084
Bug: 30627598
This reverts commit 63dccbbefef3014c99c22748d18befcc7bcb3b41.
This reverts commit 04a44135ace10123f059373691594ae0f270a8a4.
Change-Id: I568ba3e58cf103987fdd63c8a21521010a9f27c4
diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h
index 1cc193b..670accb 100644
--- a/compiler/oat_writer.h
+++ b/compiler/oat_writer.h
@@ -30,7 +30,6 @@
#include "oat.h"
#include "os.h"
#include "safe_map.h"
-#include "string_reference.h"
namespace art {
@@ -195,10 +194,6 @@
return bss_size_;
}
- size_t GetBssRootsOffset() const {
- return bss_roots_offset_;
- }
-
size_t GetOatDataOffset() const {
return oat_data_offset_;
}
@@ -270,7 +265,6 @@
size_t InitOatMaps(size_t offset);
size_t InitOatCode(size_t offset);
size_t InitOatCodeDexFiles(size_t offset);
- void InitBssLayout(InstructionSet instruction_set);
bool WriteClassOffsets(OutputStream* out);
bool WriteClasses(OutputStream* out);
@@ -328,20 +322,9 @@
// Size required for Oat data structures.
size_t oat_size_;
- // The start of the required .bss section.
- size_t bss_start_;
-
- // The size of the required .bss section holding the DexCache data and GC roots.
+ // The size of the required .bss section holding the DexCache data.
size_t bss_size_;
- // The offset of the GC roots in .bss section.
- size_t bss_roots_offset_;
-
- // Map for allocating String entries in .bss. Indexed by StringReference for the source
- // string in the dex file with the "string value comparator" for deduplication. The value
- // is the target offset for patching, starting at `bss_start_ + bss_roots_offset_`.
- SafeMap<StringReference, size_t, StringReferenceValueComparator> bss_string_entries_;
-
// Offsets of the dex cache arrays for each app dex file. For the
// boot image, this information is provided by the ImageWriter.
SafeMap<const DexFile*, size_t> dex_cache_arrays_offsets_; // DexFiles not owned.