commit d85016c68488d2110dae6d4c304e7028d934d643
author Ian Rogers <irogers@google.com> Fri Feb 03 18:27:34 2012 -0800
committer Ian Rogers <irogers@google.com> Fri Feb 03 18:32:33 2012 -0800
tree 50fdce73c7843e56dc2aa11885419267f1a030cc
parent d4135901d12fd6073603aa6fd96e587dada70cb4

Fix class linker assert

Change-Id: I371e473b88e26f1c570986d2e251d51a5650797f

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index f414c4b..32082d3 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1840,10 +1840,11 @@
     if (strcmp(descriptor, kh.GetDescriptor()) == 0 && klass->GetClassLoader() == class_loader) {
 #ifndef NDEBUG
       for (++it; it != end && it->first == hash; ++it) {
-        kh.ChangeClass(it->second);
-        CHECK(!(strcmp(descriptor, kh.GetDescriptor()) == 0 && klass->GetClassLoader() == class_loader))
+        Class* klass2 = it->second;
+        kh.ChangeClass(klass2);
+        CHECK(!(strcmp(descriptor, kh.GetDescriptor()) == 0 && klass2->GetClassLoader() == class_loader))
                 << PrettyClass(klass) << " " << klass << " " << klass->GetClassLoader() << " "
-                << PrettyClass(it->second) << " " << it->second << " " << it->second->GetClassLoader();
+                << PrettyClass(klass2) << " " << klass2 << " " << klass2->GetClassLoader();
       }
 #endif
       return klass;