commit 4668543dd0cb214265b39c92d086182455ba097b
author Ian Rogers <irogers@google.com> Sun Jun 03 22:26:43 2012 -0700
committer Ian Rogers <irogers@google.com> Sun Jun 03 22:26:43 2012 -0700
tree b936ce76dfceca38d40d2734ace078a559de5724
parent d237a3865c8c0c623fa5902b4927d95c77f85c38

Recognize calls to constructors of unresolved classes.

Change-Id: I8774a582ec2ac60c8386d1be70e2f5c8d73740e5

src/verifier/method_verifier.cc

diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc
index 015f81c..548db73 100644
--- a/src/verifier/method_verifier.cc
+++ b/src/verifier/method_verifier.cc
@@ -1858,7 +1858,19 @@
     case Instruction::INVOKE_DIRECT_RANGE: {
       bool is_range = (dec_insn.opcode == Instruction::INVOKE_DIRECT_RANGE);
       Method* called_method = VerifyInvocationArgs(dec_insn, METHOD_DIRECT, is_range, false);
-      if (called_method != NULL && called_method->IsConstructor()) {
+      const char* return_type_descriptor;
+      bool is_constructor;
+      if (called_method == NULL) {
+        uint32_t method_idx = dec_insn.vB;
+        const DexFile::MethodId& method_id = dex_file_->GetMethodId(method_idx);
+        is_constructor = StringPiece(dex_file_->GetMethodName(method_id)) == "<init>";
+        uint32_t return_type_idx = dex_file_->GetProtoId(method_id.proto_idx_).return_type_idx_;
+        return_type_descriptor =  dex_file_->StringByTypeIdx(return_type_idx);
+      } else {
+        is_constructor = called_method->IsConstructor();
+        return_type_descriptor = MethodHelper(called_method).GetReturnTypeDescriptor();
+      }
+      if (is_constructor) {
         /*
          * Some additional checks when calling a constructor. We know from the invocation arg check
          * that the "this" argument is an instance of called_method->klass. Now we further restrict
@@ -1877,12 +1889,13 @@
         }
 
         /* must be in same class or in superclass */
-        const RegType& this_super_klass = this_type.GetSuperClass(&reg_types_);
-        if (this_super_klass.IsConflict()) {
+        // const RegType& this_super_klass = this_type.GetSuperClass(&reg_types_);
+        // TODO: re-enable constructor type verification
+        // if (this_super_klass.IsConflict()) {
           // Unknown super class, fail so we re-check at runtime.
-          Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "super class unknown for '" << this_type << "'";
-          break;
-        }
+          // Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "super class unknown for '" << this_type << "'";
+          // break;
+        // }
 
         /* arg must be an uninitialized reference */
         if (!this_type.IsUninitializedTypes()) {
@@ -1897,16 +1910,7 @@
          */
         work_line_->MarkRefsAsInitialized(this_type);
       }
-      const char* descriptor;
-      if (called_method == NULL) {
-        uint32_t method_idx = dec_insn.vB;
-        const DexFile::MethodId& method_id = dex_file_->GetMethodId(method_idx);
-        uint32_t return_type_idx = dex_file_->GetProtoId(method_id.proto_idx_).return_type_idx_;
-        descriptor =  dex_file_->StringByTypeIdx(return_type_idx);
-      } else {
-        descriptor = MethodHelper(called_method).GetReturnTypeDescriptor();
-      }
-      const RegType& return_type = reg_types_.FromDescriptor(class_loader_, descriptor);
+      const RegType& return_type = reg_types_.FromDescriptor(class_loader_, return_type_descriptor);
       work_line_->SetResultRegisterType(return_type);
       just_set_result = true;
       break;
@@ -2562,7 +2566,7 @@
 }
 
 Method* MethodVerifier::VerifyInvocationArgs(const DecodedInstruction& dec_insn,
-                                          MethodType method_type, bool is_range, bool is_super) {
+                                             MethodType method_type, bool is_range, bool is_super) {
   // Resolve the method. This could be an abstract or concrete method depending on what sort of call
   // we're making.
   Method* res_method = ResolveMethodAndCheckAccess(dec_insn.vB, method_type);