diff options
| author | 2017-02-16 21:46:27 +0000 | |
|---|---|---|
| committer | 2017-02-16 21:46:27 +0000 | |
| commit | afcb365b2d3ae152989826c2afb0d98a9cf3f6be (patch) | |
| tree | abba45a6314d4b83a1e1d004019b5c9bc360b34d | |
| parent | 24bbf98cec9f39a2592892adb245ce15d58cab19 (diff) | |
Revert "Enable String compression."
The internal API String.setCharAt() is broken
with string compression.
Bug: 31040547
This reverts commit 24bbf98cec9f39a2592892adb245ce15d58cab19.
Change-Id: If2c2fa0eb42a8613994dfa5299febf7a5de2bf31
| -rw-r--r-- | runtime/asm_support.h | 2 | ||||
| -rw-r--r-- | runtime/image.cc | 2 | ||||
| -rw-r--r-- | runtime/mirror/string.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 4a2e34f243..c7a94a90dc 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -246,7 +246,7 @@ ADD_TEST_EQ(MIRROR_STRING_COUNT_OFFSET, art::mirror::String::CountOffset().Int32 ADD_TEST_EQ(MIRROR_STRING_VALUE_OFFSET, art::mirror::String::ValueOffset().Int32Value()) // String compression feature. -#define STRING_COMPRESSION_FEATURE 1 +#define STRING_COMPRESSION_FEATURE 0 ADD_TEST_EQ(STRING_COMPRESSION_FEATURE, art::mirror::kUseStringCompression); #if defined(__cplusplus) diff --git a/runtime/image.cc b/runtime/image.cc index 1acfcf5694..54b099eb14 100644 --- a/runtime/image.cc +++ b/runtime/image.cc @@ -25,7 +25,7 @@ namespace art { const uint8_t ImageHeader::kImageMagic[] = { 'a', 'r', 't', '\n' }; -const uint8_t ImageHeader::kImageVersion[] = { '0', '3', '7', '\0' }; // Enable string compression. +const uint8_t ImageHeader::kImageVersion[] = { '0', '3', '6', '\0' }; // Erroneous resolved class. ImageHeader::ImageHeader(uint32_t image_begin, uint32_t image_size, diff --git a/runtime/mirror/string.h b/runtime/mirror/string.h index 4af69c090f..409c6c2896 100644 --- a/runtime/mirror/string.h +++ b/runtime/mirror/string.h @@ -32,7 +32,7 @@ class StubTest_ReadBarrierForRoot_Test; namespace mirror { // String Compression -static constexpr bool kUseStringCompression = true; +static constexpr bool kUseStringCompression = false; enum class StringCompressionFlag : uint32_t { kCompressed = 0u, kUncompressed = 1u |