commit a3b59cb56ebc5101588c4648461f6938024221fd
author Ian Rogers <irogers@google.com> Tue Mar 19 19:50:20 2013 -0700
committer Ian Rogers <irogers@google.com> Tue Mar 19 19:50:20 2013 -0700
tree 44d240fe2484f1ff152e70360e45f9991ecc4f78
parent a3dd0b3eb296ce3b57a50d4797239a207f37487a

Fix hprof.

Static field reads should be passed the field's declaring class.

Change-Id: Ied9786dc10620861120625b5b2bb77a271dccd9e

src/hprof/hprof.cc

diff --git a/src/hprof/hprof.cc b/src/hprof/hprof.cc
index 8f691f0..472cc67 100644
--- a/src/hprof/hprof.cc
+++ b/src/hprof/hprof.cc
@@ -930,13 +930,13 @@
           rec->AddId(LookupStringId(fh.GetName()));
           rec->AddU1(t);
           if (size == 1) {
-            rec->AddU1(static_cast<uint8_t>(f->Get32(NULL)));
+            rec->AddU1(static_cast<uint8_t>(f->Get32(thisClass)));
           } else if (size == 2) {
-            rec->AddU2(static_cast<uint16_t>(f->Get32(NULL)));
+            rec->AddU2(static_cast<uint16_t>(f->Get32(thisClass)));
           } else if (size == 4) {
-            rec->AddU4(f->Get32(NULL));
+            rec->AddU4(f->Get32(thisClass));
           } else if (size == 8) {
-            rec->AddU8(f->Get64(NULL));
+            rec->AddU8(f->Get64(thisClass));
           } else {
             CHECK(false);
           }