From 19d7d50c0ae23f2041b1aee4aa8a5b789e3d2020 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 24 May 2017 13:04:14 +0100 Subject: ARM64: Fix IsAdrpPatch(). kMethodRelative patch can be an ADRP patch. Note that this minor bug had no real consequences as the patch would later be filtered out in NeedsErratum843419Thunk() because we generate the instruction sequence ADRP+ADD in this case. Also change the output for kDirectAddress from "Direct" to "DirectAddress". This kind is currently unused in checker tests. Test: Rely on TreeHugger. Bug: 30627598 Change-Id: I4e7c033aa010bbff53a554bfadd2ba0f03f69528 --- compiler/optimizing/nodes.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index bde7f2c1e0..689991010e 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -2642,7 +2642,7 @@ std::ostream& operator<<(std::ostream& os, HInvokeStaticOrDirect::MethodLoadKind case HInvokeStaticOrDirect::MethodLoadKind::kBootImageLinkTimePcRelative: return os << "BootImageLinkTimePcRelative"; case HInvokeStaticOrDirect::MethodLoadKind::kDirectAddress: - return os << "Direct"; + return os << "DirectAddress"; case HInvokeStaticOrDirect::MethodLoadKind::kDexCachePcRelative: return os << "DexCachePcRelative"; case HInvokeStaticOrDirect::MethodLoadKind::kDexCacheViaMethod: -- cgit v1.2.3-59-g8ed1b