diff options
| author | 2016-02-03 20:15:05 +0000 | |
|---|---|---|
| committer | 2016-02-03 20:15:05 +0000 | |
| commit | e9681121609e08835dd461a80eea649b94dac563 (patch) | |
| tree | bc85829e75f006caefe2830a3680cf5a807aad2a /runtime/class_linker.cc | |
| parent | 071b933eb6e937ca6b9efa24e0e3a70a50eca975 (diff) | |
| parent | e3d4ff566f9545114bf9ed72421e49eaf9d37953 (diff) | |
Merge changes I44ee74d8,I78b17187
* changes:
runtime: Update Proxy to assume 1 less direct method
runtime: Fix field resolution with access checks (runtest 073)
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index c80f91a7b8..e4f492b221 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -4104,9 +4104,10 @@ ArtMethod* ClassLinker::FindMethodForProxy(mirror::Class* proxy_class, ArtMethod void ClassLinker::CreateProxyConstructor(Handle<mirror::Class> klass, ArtMethod* out) { // Create constructor for Proxy that must initialize the method. - CHECK_EQ(GetClassRoot(kJavaLangReflectProxy)->NumDirectMethods(), 19u); + CHECK_EQ(GetClassRoot(kJavaLangReflectProxy)->NumDirectMethods(), 18u); ArtMethod* proxy_constructor = GetClassRoot(kJavaLangReflectProxy)->GetDirectMethodUnchecked( 2, image_pointer_size_); + DCHECK_EQ(std::string(proxy_constructor->GetName()), "<init>"); // Ensure constructor is in dex cache so that we can use the dex cache to look up the overridden // constructor method. GetClassRoot(kJavaLangReflectProxy)->GetDexCache()->SetResolvedMethod( |