summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2011-11-02 14:12:15 -0700
committerIan Rogers <irogers@google.com>2011-11-02 14:12:15 -0700
commitf3c1f780145511b234ae50de6e8dbd8c541b7bb0 (patch)
tree8380438846543060b14d8529e7265e57e65cd0f6 /src
parent5d76c435082332ef79a22962386fa92a0870e378 (diff)
downloadart-f3c1f780145511b234ae50de6e8dbd8c541b7bb0.zip
art-f3c1f780145511b234ae50de6e8dbd8c541b7bb0.tar.gz
art-f3c1f780145511b234ae50de6e8dbd8c541b7bb0.tar.bz2
Allow Object to match as interface class target.
Change-Id: Ie99746c8d13aed63507e5c90dcef922f2caba701
Diffstat (limited to 'src')
-rw-r--r--src/dex_verifier.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 8793c95..9f66250 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -2481,7 +2481,7 @@ bool DexVerifier::CodeFlowVerifyInstruction(uint32_t* start_guess) {
if (failure_ == VERIFY_ERROR_NONE) {
if (abs_method != NULL) {
Class* called_interface = abs_method->GetDeclaringClass();
- if (!called_interface->IsInterface()) {
+ if (!called_interface->IsInterface() && !called_interface->IsObjectClass()) {
Fail(VERIFY_ERROR_CLASS_CHANGE) << "expected interface class in invoke-interface '"
<< PrettyMethod(abs_method) << "'";
break;