From 659562aaf133c41b8d90ec9216c07646f0f14362 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Mon, 14 Sep 2015 21:26:33 +0000 Subject: Revert "ART: Register allocation and runtime support for try/catch" Breaks libcore test org.apache.harmony.security.tests.java.security.KeyStorePrivateKeyEntryTest#testGetCertificateChain. Need to investigate. This reverts commit b022fa1300e6d78639b3b910af0cf85c43df44bb. Change-Id: Ib24d3a80064d963d273e557a93469c95f37b1f6f --- compiler/optimizing/code_generator.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index a93d07ad50..b3c4d727e0 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -237,17 +237,6 @@ class CodeGenerator { bool CanMoveNullCheckToUser(HNullCheck* null_check); void MaybeRecordImplicitNullCheck(HInstruction* instruction); - // Records a stack map which the runtime might use to set catch phi values - // during exception delivery. - // TODO: Replace with a catch-entering instruction that records the environment. - void RecordCatchBlockInfo(); - - // Returns true if implicit null checks are allowed in the compiler options - // and if the null check is not inside a try block. We currently cannot do - // implicit null checks in that case because we need the NullCheckSlowPath to - // save live registers, which may be needed by the runtime to set catch phis. - bool IsImplicitNullCheckAllowed(HNullCheck* null_check) const; - void AddSlowPath(SlowPathCode* slow_path) { slow_paths_.Add(slow_path); } -- cgit v1.2.3-59-g8ed1b