diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dex_file.cc | 1 | ||||
| -rw-r--r-- | src/dex_verifier.cc | 2 | ||||
| -rw-r--r-- | src/java_lang_Class.cc | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/dex_file.cc b/src/dex_file.cc index c17a225b80..7c54018587 100644 --- a/src/dex_file.cc +++ b/src/dex_file.cc @@ -435,7 +435,6 @@ void DexFile::InitIndex() { } const DexFile::ClassDef* DexFile::FindClassDef(const StringPiece& descriptor) const { - CHECK(!descriptor.empty()); Index::const_iterator it = index_.find(descriptor); if (it == index_.end()) { return NULL; diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc index e0032b2a47..a800f20387 100644 --- a/src/dex_verifier.cc +++ b/src/dex_verifier.cc @@ -3589,7 +3589,7 @@ sput_1nr_common: } DCHECK_LT(*start_guess, insns_size); - DCHECK(InsnGetWidth(insn_flags, *start_guess) != 0); + DCHECK_NE(InsnGetWidth(insn_flags, *start_guess), 0); return true; } diff --git a/src/java_lang_Class.cc b/src/java_lang_Class.cc index 3e80c6b14f..8ad59b4566 100644 --- a/src/java_lang_Class.cc +++ b/src/java_lang_Class.cc @@ -51,7 +51,7 @@ jobject Class_getDeclaredConstructorOrMethod(JNIEnv* env, jclass, DCHECK(name->IsString()); Object* signature_obj = Decode<Object*>(env, jsignature); DCHECK(signature_obj->IsArrayInstance()); - // check that this is a Class[] by checkin that component type is Class + // check that this is a Class[] by checking that component type is Class // foo->GetClass()->GetClass() is an idiom for getting java.lang.Class from an arbitrary object DCHECK(signature_obj->GetClass()->GetComponentType() == signature_obj->GetClass()->GetClass()); ObjectArray<Class>* signature = down_cast<ObjectArray<Class>*>(signature_obj); @@ -80,8 +80,8 @@ jobject Class_getDeclaredConstructorOrMethod(JNIEnv* env, jclass, return AddLocalReference<jobject>(env, method); } - for (size_t i = 0; i < klass->NumVirtualMethods(); ++i) { - Method* method = klass->GetVirtualMethod(i); + for (size_t i = 0; i < klass->NumDirectMethods(); ++i) { + Method* method = klass->GetDirectMethod(i); if (!method->GetName()->Equals(name)) { continue; } |