diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-06 19:47:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-06 19:47:14 +0000 |
| commit | 709d8df91d829573e399b68db882399e5509aeb5 (patch) | |
| tree | 33daa35b0d24b3c56fd6be3809a12a6e4b2d7f02 | |
| parent | a6aad92310895d35d8004da917100806d35d6b16 (diff) | |
| parent | ff38c04b88e86bffdd520bc1863d05334ada6c94 (diff) | |
| download | art-709d8df91d829573e399b68db882399e5509aeb5.zip art-709d8df91d829573e399b68db882399e5509aeb5.tar.gz art-709d8df91d829573e399b68db882399e5509aeb5.tar.bz2 | |
Merge "Fix byte and char Get32"
| -rw-r--r-- | runtime/hprof/hprof.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc index d2e93bc..7da22b1 100644 --- a/runtime/hprof/hprof.cc +++ b/runtime/hprof/hprof.cc @@ -1010,10 +1010,10 @@ void Hprof::DumpHeapClass(mirror::Class* klass, EndianOutput* output) { __ AddU1(t); switch (size) { case 1: - __ AddU1(static_cast<uint8_t>(f->Get32(klass))); + __ AddU1(f->GetByte(klass)); break; case 2: - __ AddU2(static_cast<uint16_t>(f->Get32(klass))); + __ AddU2(f->GetChar(klass)); break; case 4: __ AddU4(f->Get32(klass)); @@ -1101,9 +1101,9 @@ void Hprof::DumpHeapInstanceObject(mirror::Object* obj, mirror::Class* klass, size_t size; SignatureToBasicTypeAndSize(f->GetTypeDescriptor(), &size); if (size == 1) { - __ AddU1(f->Get32(obj)); + __ AddU1(f->GetByte(obj)); } else if (size == 2) { - __ AddU2(f->Get32(obj)); + __ AddU2(f->GetChar(obj)); } else if (size == 4) { __ AddU4(f->Get32(obj)); } else { |