commit 5fe594f576225dd7d333835e39c448a71ea9b433
author Elliott Hughes <enh@google.com> Thu Sep 08 12:33:17 2011 -0700
committer Elliott Hughes <enh@google.com> Thu Sep 08 14:26:18 2011 -0700
tree f9b6203abaf07df1421f6e7cadcbb2c307cef5b2
parent 4ef765227a0098b6f4dfe47d2d7a6f084cec9560

A bit further along the track of multiple threads.

This also makes valgrind happy, and tsan mostly happy. (The heap, it turns out,
doesn't have a lock yet.)

The DexVerifier changes are just to make valgrind happy, and the code a little
less unidiomatic.

Change-Id: Ic5d436b4863b9d7088eb0b8fe9d32308919899d8

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 71cb22e..607382b 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -40,7 +40,7 @@
     EXPECT_TRUE(primitive->GetStatus() == Class::kStatusInitialized);
     EXPECT_FALSE(primitive->IsErroneous());
     EXPECT_TRUE(primitive->IsVerified());
-    EXPECT_TRUE(primitive->IsLinked());
+    EXPECT_TRUE(primitive->IsResolved());
     EXPECT_FALSE(primitive->IsArrayInstance());
     EXPECT_FALSE(primitive->IsArrayClass());
     EXPECT_EQ(0, primitive->GetArrayRank());
@@ -81,7 +81,7 @@
     EXPECT_TRUE(array->GetStatus() == Class::kStatusInitialized);
     EXPECT_FALSE(array->IsErroneous());
     EXPECT_TRUE(array->IsVerified());
-    EXPECT_TRUE(array->IsLinked());
+    EXPECT_TRUE(array->IsResolved());
     EXPECT_FALSE(array->IsArrayInstance());
     EXPECT_TRUE(array->IsArrayClass());
     EXPECT_LE(1, array->GetArrayRank());
@@ -138,10 +138,9 @@
       EXPECT_TRUE(klass->GetSuperClass() != NULL);
     }
     EXPECT_TRUE(klass->GetDexCache() != NULL);
-    EXPECT_EQ(Class::kStatusResolved, klass->GetStatus());
+    EXPECT_TRUE(klass->IsResolved());
     EXPECT_FALSE(klass->IsErroneous());
-    EXPECT_FALSE(klass->IsVerified());
-    EXPECT_TRUE(klass->IsLinked());
+    EXPECT_TRUE(klass->IsResolved());
     EXPECT_TRUE(klass->IsLoaded());
     EXPECT_FALSE(klass->IsArrayClass());
     EXPECT_EQ(0, klass->GetArrayRank());
@@ -309,8 +308,8 @@
   EXPECT_FALSE(JavaLangObject->HasSuperClass());
   EXPECT_TRUE(JavaLangObject->GetClassLoader() == NULL);
   EXPECT_FALSE(JavaLangObject->IsErroneous());
-  EXPECT_FALSE(JavaLangObject->IsVerified());
-  EXPECT_TRUE(JavaLangObject->IsLinked());
+  EXPECT_TRUE(JavaLangObject->IsVerified());
+  EXPECT_TRUE(JavaLangObject->IsResolved());
   EXPECT_FALSE(JavaLangObject->IsArrayInstance());
   EXPECT_FALSE(JavaLangObject->IsArrayClass());
   EXPECT_EQ(0, JavaLangObject->GetArrayRank());
@@ -339,7 +338,7 @@
   EXPECT_TRUE(MyClass->GetStatus() == Class::kStatusResolved);
   EXPECT_FALSE(MyClass->IsErroneous());
   EXPECT_FALSE(MyClass->IsVerified());
-  EXPECT_TRUE(MyClass->IsLinked());
+  EXPECT_TRUE(MyClass->IsResolved());
   EXPECT_FALSE(MyClass->IsArrayInstance());
   EXPECT_FALSE(MyClass->IsArrayClass());
   EXPECT_EQ(0, JavaLangObject->GetArrayRank());