diff options
| author | 2017-03-30 23:17:19 +0000 | |
|---|---|---|
| committer | 2017-03-30 23:17:20 +0000 | |
| commit | 4f0250ca952cb3d489604c0de4f318bbc1bb12ba (patch) | |
| tree | 81a8e73d4505515b2c0d38bed93cff61dfab7086 | |
| parent | f62940eab11f6d8fa6f07a3976245939c3db7ab7 (diff) | |
| parent | 16d7ec4bf7483bb1b3d2317c8c5f03cf3cc6d208 (diff) | |
Merge "Update profile version"
| -rw-r--r-- | dexlayout/dexlayout_test.cc | 2 | ||||
| -rw-r--r-- | runtime/jit/profile_compilation_info.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/dexlayout/dexlayout_test.cc b/dexlayout/dexlayout_test.cc index 4ef48ff254..4f7040427e 100644 --- a/dexlayout/dexlayout_test.cc +++ b/dexlayout/dexlayout_test.cc @@ -41,7 +41,7 @@ static const char kDexFileLayoutInputDex[] = "AAAAdQEAAAAQAAABAAAAjAEAAA=="; static const char kDexFileLayoutInputProfile[] = - "cHJvADAwNAABCwABAAAAAAD1KW3+Y2xhc3Nlcy5kZXgBAA=="; + "cHJvADAwNQABCwABAAAAAAD1KW3+Y2xhc3Nlcy5kZXgBAA=="; // Dex file with catch handler unreferenced by try blocks. // Constructed by building a dex file with try/catch blocks and hex editing. diff --git a/runtime/jit/profile_compilation_info.cc b/runtime/jit/profile_compilation_info.cc index 13dbc3f949..24ea27529a 100644 --- a/runtime/jit/profile_compilation_info.cc +++ b/runtime/jit/profile_compilation_info.cc @@ -37,8 +37,9 @@ namespace art { const uint8_t ProfileCompilationInfo::kProfileMagic[] = { 'p', 'r', 'o', '\0' }; -// Last profile version: fix the order of dex files in the profile. -const uint8_t ProfileCompilationInfo::kProfileVersion[] = { '0', '0', '4', '\0' }; +// Last profile version: fix profman merges. Update profile version to force +// regeneration of possibly faulty profiles. +const uint8_t ProfileCompilationInfo::kProfileVersion[] = { '0', '0', '5', '\0' }; static constexpr uint16_t kMaxDexFileKeyLength = PATH_MAX; |