Skip to content

Commit

Permalink
Back out "Do not resolve refs on wrapper apis"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Wei Zhang (Devinfra) authored and facebook-github-bot committed Oct 1, 2024
1 parent 8599c1c commit 5f179a4
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions opt/resolve-refs/ResolveRefsPass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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()) {
Expand Down

0 comments on commit 5f179a4

Please sign in to comment.