OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e93505f
)
Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"
author
Andreas Gampe
<agampe@google.com>
Fri, 31 Jul 2015 20:31:24 +0000
(20:31 +0000)
committer
Andreas Gampe
<agampe@google.com>
Fri, 31 Jul 2015 20:31:24 +0000
(20:31 +0000)
This reverts commit
e93505f599682a2e95c4dac1c8633dec79c602bc
.
This isn't the right thing to do, actually.
Bug:
22871329
Change-Id: I0a0a5a86c7c8d8afdf417444ca7d73e56e040515
runtime/verifier/method_verifier.cc
patch
|
blob
|
history
diff --git
a/runtime/verifier/method_verifier.cc
b/runtime/verifier/method_verifier.cc
index
021102e
..
d63b455
100644
(file)
--- a/
runtime/verifier/method_verifier.cc
+++ b/
runtime/verifier/method_verifier.cc
@@
-2873,10
+2873,6
@@
bool MethodVerifier::CodeFlowVerifyInstruction(uint32_t* start_guess) {
break;
}
}
- } else {
- Fail(VERIFY_ERROR_BAD_CLASS_HARD)
- << "return-void-no-barrier not expected for non-constructor method "
- << PrettyMethod(dex_method_idx_, *dex_file_, true);
}
break;
// Note: the following instructions encode offsets derived from class linking.