diff options
| author | 2016-02-02 10:46:42 -0800 | |
|---|---|---|
| committer | 2016-02-02 13:08:57 -0800 | |
| commit | e3d4ff566f9545114bf9ed72421e49eaf9d37953 (patch) | |
| tree | decbc23fa522ca86f21126c474417493d1ae1e92 /runtime/class_linker.cc | |
| parent | f1b4c41dba8ea69c25f7db53eec97a8936e0d7f0 (diff) | |
runtime: Update Proxy to assume 1 less direct method
Part of a libcore-side cleanup to remove dead code.
Requires a corresponding libcore change to run.
Bug: 26846861
Change-Id: I44ee74d8a4cbd7889d655c15c76dad8121c3297e
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 5ef199cb60..35e1ee6cb3 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -4025,9 +4025,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( |