diff options
| author | 2015-09-15 12:34:04 +0000 | |
|---|---|---|
| committer | 2015-09-15 12:34:04 +0000 | |
| commit | 77a48ae01bbc5b05ca009cf09e2fcb53e4c8ff23 (patch) | |
| tree | 780c7d6bdee784c2f8248979de348491cfb63b34 /compiler/optimizing/builder.cc | |
| parent | 659562aaf133c41b8d90ec9216c07646f0f14362 (diff) | |
Revert "Revert "ART: Register allocation and runtime support for try/catch""
The original CL triggered b/24084144 which has been fixed
by Ib72e12a018437c404e82f7ad414554c66a4c6f8c.
This reverts commit 659562aaf133c41b8d90ec9216c07646f0f14362.
Change-Id: Id8980436172457d0fcb276349c4405f7c4110a55
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 9895953e1f..0a3f083e10 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -478,6 +478,8 @@ bool HGraphBuilder::BuildGraph(const DexFile::CodeItem& code_item) { graph_->SetEntryBlock(entry_block_); graph_->SetExitBlock(exit_block_); + graph_->SetHasTryCatch(code_item.tries_size_ != 0); + InitializeLocals(code_item.registers_size_); graph_->SetMaximumNumberOfOutVRegs(code_item.outs_size_); |