Merge "TBAA, separate RuntimeInfo and ShadowFrame." into ics-mr1-plus-art

1 files changed, 4 insertions, 4 deletions

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index de0e1ea806..b3ae1a6a02 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -262,7 +262,7 @@ void MethodCompiler::EmitPrologueAllocShadowFrame() {
   llvm::ConstantAggregateZero* zero_initializer =
     llvm::ConstantAggregateZero::get(shadow_frame_type);
 
-  irb_.CreateStore(zero_initializer, shadow_frame_, kTBAARuntimeInfo);
+  irb_.CreateStore(zero_initializer, shadow_frame_, kTBAAShadowFrame);
 
   // Get method object
   llvm::Value* method_object_addr = EmitLoadMethodObjectAddr();
@@ -271,13 +271,13 @@ void MethodCompiler::EmitPrologueAllocShadowFrame() {
   irb_.StoreToObjectOffset(shadow_frame_,
                            ShadowFrame::MethodOffset(),
                            method_object_addr,
-                           kTBAARuntimeInfo);
+                           kTBAAShadowFrame);
 
   // Store the number of the pointer slots
   irb_.StoreToObjectOffset(shadow_frame_,
                            ShadowFrame::NumberOfReferencesOffset(),
                            irb_.getJInt(sirt_size),
-                           kTBAARuntimeInfo);
+                           kTBAAShadowFrame);
 
   // Push the shadow frame
   llvm::Value* shadow_frame_upcast =
@@ -3918,7 +3918,7 @@ void MethodCompiler::EmitUpdateDexPC(uint32_t dex_pc) {
   irb_.StoreToObjectOffset(shadow_frame_,
                            ShadowFrame::DexPCOffset(),
                            irb_.getInt32(dex_pc),
-                           kTBAARuntimeInfo);
+                           kTBAAShadowFrame);
 }