From 5117fe6bf9bd58b49b2b7647b148b4c3ea3b17ed Mon Sep 17 00:00:00 2001 From: Matt Wettlaufer Date: Thu, 25 Apr 2024 20:59:11 +0000 Subject: Revert "Fast-path for `HInstanceOf`/`kInterfaceCheck`." This reverts commit 20668496dda44e4877d3c29afc22cd098701d461. Reason for revert: DroidMonitor. Potential culprit for b/337042605 - verifying through ABTD before submission. Change-Id: I64db3d0e0e701a174add7787c8fa0dbf593fbb4b --- compiler/optimizing/code_generator.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 3ac4bd7dcc..970da76c43 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -461,13 +461,11 @@ class CodeGenerator : public DeletableArenaObject { DataType::Type type2); bool InstanceOfNeedsReadBarrier(HInstanceOf* instance_of) { - // Used only for `kExactCheck`, `kAbstractClassCheck`, `kClassHierarchyCheck`, - // `kArrayObjectCheck` and `kInterfaceCheck`. + // Used only for kExactCheck, kAbstractClassCheck, kClassHierarchyCheck and kArrayObjectCheck. DCHECK(instance_of->GetTypeCheckKind() == TypeCheckKind::kExactCheck || instance_of->GetTypeCheckKind() == TypeCheckKind::kAbstractClassCheck || instance_of->GetTypeCheckKind() == TypeCheckKind::kClassHierarchyCheck || - instance_of->GetTypeCheckKind() == TypeCheckKind::kArrayObjectCheck || - instance_of->GetTypeCheckKind() == TypeCheckKind::kInterfaceCheck) + instance_of->GetTypeCheckKind() == TypeCheckKind::kArrayObjectCheck) << instance_of->GetTypeCheckKind(); // If the target class is in the boot or app image, it's non-moveable and it doesn't matter // if we compare it with a from-space or to-space reference, the result is the same. -- cgit v1.2.3-59-g8ed1b