diff options
| author | Andreas Gampe <agampe@google.com> | 2015-08-29 01:58:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-29 01:58:23 +0000 |
| commit | e003973b8692ff8e792b6b3c176e7d7095fda45f (patch) | |
| tree | 724058f1db5c0789c3a3c26fdd8be55018a6e2be | |
| parent | 1cb93f02f5338aaaae4c5cbb7680b385b6bedf70 (diff) | |
| parent | e4cf5892c2a244034900d49499c071b255571bba (diff) | |
| download | android_art-e003973b8692ff8e792b6b3c176e7d7095fda45f.tar.gz android_art-e003973b8692ff8e792b6b3c176e7d7095fda45f.tar.bz2 android_art-e003973b8692ff8e792b6b3c176e7d7095fda45f.zip | |
am e4cf5892: ART: Weaken size check in hprof
* commit 'e4cf5892c2a244034900d49499c071b255571bba':
ART: Weaken size check in hprof
| -rw-r--r-- | runtime/hprof/hprof.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc index a2a4f0df6f..ba28861927 100644 --- a/runtime/hprof/hprof.cc +++ b/runtime/hprof/hprof.cc @@ -671,8 +671,9 @@ class Hprof : public SingleRootVisitor { okay = !file_output.Errors(); if (okay) { - // Check for expected size. - CHECK_EQ(file_output.SumLength(), overall_size); + // Check for expected size. Output is expected to be less-or-equal than first phase, see + // b/23521263. + DCHECK_LE(file_output.SumLength(), overall_size); } output_ = nullptr; } @@ -716,8 +717,8 @@ class Hprof : public SingleRootVisitor { // Write the dump. ProcessHeap(true); - // Check for expected size. - CHECK_EQ(net_output.SumLength(), overall_size + kChunkHeaderSize); + // Check for expected size. See DumpToFile for comment. + DCHECK_LE(net_output.SumLength(), overall_size + kChunkHeaderSize); output_ = nullptr; return true; |