diff options
| author | 2012-08-23 12:23:44 -0700 | |
|---|---|---|
| committer | 2012-09-15 04:51:25 -0700 | |
| commit | 347166aeff128c86f921ec214a2789ca89b84e70 (patch) | |
| tree | 0f078a03eba903cf0ff304a96e82071bbb622223 /src/compiler_llvm | |
| parent | 3fdb33a39732e7fea55dd40f9d006455ad0072dd (diff) | |
Fix run-test 030.
Change-Id: I87a819162d9705136c1dcad6424058ffbf033922
Diffstat (limited to 'src/compiler_llvm')
| -rw-r--r-- | src/compiler_llvm/gbc_expander.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compiler_llvm/gbc_expander.cc b/src/compiler_llvm/gbc_expander.cc index 3dcd793c74..471a1250ae 100644 --- a/src/compiler_llvm/gbc_expander.cc +++ b/src/compiler_llvm/gbc_expander.cc @@ -1158,6 +1158,11 @@ void GBCExpanderPass::Expand_SetShadowFrameEntry(llvm::Value* obj, }; llvm::Value* entry_addr = irb_.CreateGEP(shadow_frame_, gep_index); +#if defined(ART_USE_QUICK_COMPILER) + if (obj->getType() != irb_.getJObjectTy()) { + obj = irb_.getJNull(); + } +#endif irb_.CreateStore(obj, entry_addr, kTBAAShadowFrame); return; } |