commit ec0142313a470edecf52b4f034433404b7264358
author jeffhao <jeffhao@google.com> Wed Sep 05 10:42:25 2012 -0700
committer jeffhao <jeffhao@google.com> Wed Sep 05 10:42:25 2012 -0700
tree 594b564e4768a12f9dec70074b420c9b6d2cab3f
parent b726dcb581bf72da46527378ccb6889020f0e6e9

Classes that hard fail compile-time verification are now marked error.

They were being marked "not ready" before, which would still cause the
verifier to check them at runtime, even though they were never compiled.

Change-Id: Ic29cc4239cb163e5093b3fb22afa6970205caea4

src/oat_writer.cc

diff --git a/src/oat_writer.cc b/src/oat_writer.cc
index ce15368..a7951f3 100644
--- a/src/oat_writer.cc
+++ b/src/oat_writer.cc
@@ -26,6 +26,7 @@
 #include "scoped_thread_state_change.h"
 #include "space.h"
 #include "stl_util.h"
+#include "verifier/method_verifier.h"
 
 namespace art {
 
@@ -129,10 +130,16 @@
         num_methods = num_direct_methods + num_virtual_methods;
       }
 
-      CompiledClass* compiled_class =
-          compiler_->GetCompiledClass(Compiler::MethodReference(dex_file, class_def_index));
-      Class::Status status =
-          (compiled_class != NULL) ? compiled_class->GetStatus() : Class::kStatusNotReady;
+      Compiler::ClassReference class_ref = Compiler::ClassReference(dex_file, class_def_index);
+      CompiledClass* compiled_class = compiler_->GetCompiledClass(class_ref);
+      Class::Status status;
+      if (compiled_class != NULL) {
+        status = compiled_class->GetStatus();
+      } else if (verifier::MethodVerifier::IsClassRejected(class_ref)) {
+        status = Class::kStatusError;
+      } else {
+        status = Class::kStatusNotReady;
+      }
 
       OatClass* oat_class = new OatClass(status, num_methods);
       oat_classes_.push_back(oat_class);
@@ -296,10 +303,16 @@
 
 #if !defined(NDEBUG) && !defined(ART_USE_LLVM_COMPILER)
     // We expect GC maps except when the class hasn't been verified or the method is native
-    CompiledClass* compiled_class =
-        compiler_->GetCompiledClass(Compiler::MethodReference(dex_file, class_def_index));
-    Class::Status status =
-        (compiled_class != NULL) ? compiled_class->GetStatus() : Class::kStatusNotReady;
+    Compiler::ClassReference class_ref = Compiler::ClassReference(dex_file, class_def_index);
+    CompiledClass* compiled_class = compiler_->GetCompiledClass(class_ref);
+    Class::Status status;
+    if (compiled_class != NULL) {
+      status = compiled_class->GetStatus();
+    } else if (verifier::MethodVerifier::IsClassRejected(class_ref)) {
+      status = Class::kStatusError;
+    } else {
+      status = Class::kStatusNotReady;
+    }
     CHECK(gc_map_size != 0 || is_native || status < Class::kStatusVerified)
         << &gc_map << " " << gc_map_size << " " << (is_native ? "true" : "false") << " " << (status < Class::kStatusVerified) << " " << status << " " << PrettyMethod(method_idx, *dex_file);
 #endif