commit d23eeef3492b53102eb8093524cf37e2b4c296db
author Nicolas Geoffray <ngeoffray@google.com> Mon May 18 22:31:29 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri May 29 14:15:04 2015 +0100
tree 57d3e9ab2853d5b8092568bb3d29bc850c113315
parent a15c78d3cc28f514a482ffd792a767e97fe53c95

Support for inlining methods that call/throw.

Mostly fixes here and there to make it working.

Change-Id: I1b535e895105d78b65634636d675b818551f783e

compiler/optimizing/ssa_builder.cc

diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc
index c51d248..c4612af 100644
--- a/compiler/optimizing/ssa_builder.cc
+++ b/compiler/optimizing/ssa_builder.cc
@@ -548,7 +548,8 @@
       GetGraph()->GetDexFile(),
       GetGraph()->GetMethodIdx(),
       instruction->GetDexPc(),
-      GetGraph()->GetInvokeType());
+      GetGraph()->GetInvokeType(),
+      instruction);
   environment->CopyFrom(*current_locals_);
   instruction->SetRawEnvironment(environment);
 }