diff options
| author | 2016-04-15 10:09:16 -0700 | |
|---|---|---|
| committer | 2016-04-15 17:14:38 -0700 | |
| commit | 8f4ade0f05c0203b33e5f421d1e3794ab6075a82 (patch) | |
| tree | 60a6029ef116d7a71c8e8b32aa2388f48c48685c | |
| parent | 2dcab783cd7a5a4351c50755b3b3de927e70ac38 (diff) | |
ART: Fix nits for verifier change
Follow-up to 6659624baadf2285ac5880fd28ffa31767dcae0b.
Bug: 28187158
Change-Id: Ie81aff1cae1ff275faaaf4b858608e74b86d8622
| -rw-r--r-- | runtime/verifier/method_verifier.cc | 3 | ||||
| -rw-r--r-- | test/800-smali/smali/b_28187158.smali | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index a0987b5161..647578e58a 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -4583,7 +4583,8 @@ ArtField* MethodVerifier::GetInstanceField(const RegType& obj_type, int field_id // Compiler & unresolved types involved, retry at runtime. type = VerifyError::VERIFY_ERROR_NO_CLASS; } else { - // Classes known, or at compile time. This is a hard failure. + // Classes known (resolved; and thus assignability check is precise), or we are at runtime + // and still missing classes. This is a hard failure. type = VerifyError::VERIFY_ERROR_BAD_CLASS_HARD; } Fail(type) << "cannot access instance field " << PrettyField(field) diff --git a/test/800-smali/smali/b_28187158.smali b/test/800-smali/smali/b_28187158.smali index 7dd2022483..14d5cec7ee 100644 --- a/test/800-smali/smali/b_28187158.smali +++ b/test/800-smali/smali/b_28187158.smali @@ -6,6 +6,7 @@ .method public static run(Ljava/lang/Integer;)V .registers 2 - iget v0, p0, Ljava/lang/String;->length:I + iget v0, p0, Ljava/lang/System;->in:Ljava/io/InputStream; + return-void .end method |