From b093c6b27f8ea9bbe2d49c03ebe345203a121199 Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Mon, 31 Oct 2011 16:19:55 -0700
Subject: Support for access check in checkcast and instanceof.

Change-Id: Ie15216618b35cace7d351be2b0a1c466ed6db489
---
 src/compiler/codegen/arm/MethodCodegenDriver.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/compiler/codegen/arm/MethodCodegenDriver.cc')

diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index 2edd3986a7..a32446ac8a 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -164,6 +164,10 @@ Field* FindFieldWithResolvedStaticStorage(const Method* method,
     art::ClassLinker* class_linker = art::Runtime::Current()->GetClassLinker();
     Field* field = class_linker->ResolveField(fieldIdx, method, true);
     if (field == NULL) {
+        Thread* thread = Thread::Current();
+        if (thread->IsExceptionPending()) {  // clear any exception left by resolve field
+            thread->ClearException();
+        }
         return NULL;
     }
     const art::DexFile& dex_file = class_linker->
-- 
cgit v1.2.3-59-g8ed1b