From 5f179a4d2d83b9f41b157d6e4812c235e9221794 Mon Sep 17 00:00:00 2001 From: "Wei Zhang (Devinfra)" Date: Mon, 30 Sep 2024 23:56:01 -0700 Subject: [PATCH] Back out "Do not resolve refs on wrapper apis" Summary: D63414234 broke a property checker ran after ResolveRefsPass. This is the build error [msg](https://www.internalfb.com/chronos/job_instance/atn/16888508586943442/simple-logs). Original commit changeset: 37f7a6294481 Original Phabricator Diff: D63414234 Reviewed By: itang00 Differential Revision: D63680229 fbshipit-source-id: ef551a6fcc25973453be8c7becf546b658889fc2 --- opt/resolve-refs/ResolveRefsPass.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/opt/resolve-refs/ResolveRefsPass.cpp b/opt/resolve-refs/ResolveRefsPass.cpp index 034d7d64ed..890bfd1a4d 100644 --- a/opt/resolve-refs/ResolveRefsPass.cpp +++ b/opt/resolve-refs/ResolveRefsPass.cpp @@ -20,7 +20,6 @@ #include "Trace.h" #include "TypeInference.h" #include "Walkers.h" -#include "WrappedPrimitives.h" namespace mog = method_override_graph; using namespace resolve_refs; @@ -261,10 +260,6 @@ void ResolveRefsPass::resolve_method_refs(const DexMethod* caller, RefStats& stats) { always_assert(insn->has_method()); auto mref = insn->get_method(); - if (wrapped_primitives::is_wrapped_api(mref)) { - TRACE(RESO, 4, "skipping resolution for %s", SHOW(mref)); - return; - } bool resolved_virtual_to_interface; auto mdef = resolve_invoke_method(insn, caller, &resolved_virtual_to_interface); @@ -436,10 +431,6 @@ RefStats ResolveRefsPass::refine_virtual_callsites(const XStoreRefs& xstores, } auto mref = insn->get_method(); - if (wrapped_primitives::is_wrapped_api(mref)) { - TRACE(RESO, 4, "skipping resolution for %s", SHOW(mref)); - continue; - } auto callee = resolve_method(mref, opcode_to_search(insn), method); if (!callee) { if (mref != method::java_lang_Objects_clone()) {