commit 1b86d07dd97544b98b8c474fac106477ed418f98
author TDYa127 <tdy@google.com> Thu Apr 05 17:38:56 2012 -0700
committer Shih-wei Liao <sliao@google.com> Thu Apr 05 23:08:06 2012 -0700
tree c21aa897d9906a4d6b1259092c006c0a188125ca
parent 308ea6cdd65cac0de9944a59dac0a4e3bf9aa76f

Implement CheckPutArrayElement.

Change-Id: Ie9617df1debb57c80b937bc033ff231c4daedd0d

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index bcd40de..8b1cef6 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -2328,6 +2328,14 @@
 
   llvm::Value* new_value = EmitLoadDalvikReg(dec_insn.vA, elem_jty, kArray);
 
+  if (elem_jty == kObject) { // If put an object, check the type.
+    llvm::Function* runtime_func = irb_.GetRuntime(CheckPutArrayElement);
+
+    irb_.CreateCall2(runtime_func, new_value, array_addr);
+
+    EmitGuard_ExceptionLandingPad(dex_pc);
+  }
+
   irb_.CreateStore(new_value, array_elem_addr);
 
   irb_.CreateBr(GetNextBasicBlock(dex_pc));