From d8ef0c69330f74f325f7671236ca6bf44b7ec9c9 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 10 Nov 2015 18:49:28 +0000 Subject: ART: Remove unnecessary helper method from GraphChecker Change-Id: I59f50a559da560033f4c9407d83b68fc5d64bd3c --- compiler/optimizing/graph_checker.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'compiler/optimizing/graph_checker.cc') diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc index 091f1c7e89..5814d7556f 100644 --- a/compiler/optimizing/graph_checker.cc +++ b/compiler/optimizing/graph_checker.cc @@ -162,13 +162,6 @@ void GraphChecker::VisitBoundsCheck(HBoundsCheck* check) { VisitInstruction(check); } -// Returns true if there exists `index2` such that `index2 > index` and -// `array[index] == array[index2]`. -static bool ContainsSameValueAfter(ArrayRef array, size_t index) { - ArrayRef tail = array.SubArray(index + 1); - return std::find(tail.begin(), tail.end(), array[index]) != tail.end(); -} - void GraphChecker::VisitTryBoundary(HTryBoundary* try_boundary) { ArrayRef handlers = try_boundary->GetExceptionHandlers(); @@ -188,8 +181,8 @@ void GraphChecker::VisitTryBoundary(HTryBoundary* try_boundary) { // Ensure that handlers are not listed multiple times. for (size_t i = 0, e = handlers.size(); i < e; ++i) { - if (ContainsSameValueAfter(handlers, i)) { - AddError(StringPrintf("Exception handler block %d of %s:%d is listed multiple times.", + if (ContainsElement(handlers, handlers[i], i + 1)) { + AddError(StringPrintf("Exception handler block %d of %s:%d is listed multiple times.", handlers[i]->GetBlockId(), try_boundary->DebugName(), try_boundary->GetId())); -- cgit v1.2.3-59-g8ed1b