TBAA, separate RuntimeInfo and JRuntime.
Change-Id: Ia540883349e2699503d7eeb1d4b602beeb74510f
diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 6430620..193f570 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -1242,13 +1242,13 @@
irb_.LoadFromObjectOffset(thread_object_addr,
Thread::ExceptionOffset().Int32Value(),
irb_.getJObjectTy(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
// Set thread-local exception field address to NULL
irb_.StoreToObjectOffset(thread_object_addr,
Thread::ExceptionOffset().Int32Value(),
irb_.getJNull(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
// Keep the exception object in the Dalvik register
EmitStoreDalvikReg(dec_insn.vA, kObject, kAccurate, exception_object_addr);
@@ -1389,7 +1389,7 @@
llvm::Value* string_field_addr = EmitLoadDexCacheStringFieldAddr(string_idx);
- llvm::Value* string_addr = irb_.CreateLoad(string_field_addr, kTBAARuntimeInfo);
+ llvm::Value* string_addr = irb_.CreateLoad(string_field_addr, kTBAAJRuntime);
if (!compiler_->CanAssumeStringIsPresentInDexCache(dex_cache_, string_idx)) {
llvm::BasicBlock* block_str_exist =
@@ -1459,7 +1459,7 @@
llvm::Value* type_field_addr =
EmitLoadDexCacheResolvedTypeFieldAddr(type_idx);
- llvm::Value* type_object_addr = irb_.CreateLoad(type_field_addr, kTBAARuntimeInfo);
+ llvm::Value* type_object_addr = irb_.CreateLoad(type_field_addr, kTBAAJRuntime);
if (compiler_->CanAssumeTypeIsPresentInDexCache(dex_cache_, type_idx)) {
return type_object_addr;
@@ -1600,7 +1600,7 @@
irb_.CreateBitCast(object_addr, jobject_ptr_ty->getPointerTo());
llvm::Value* object_type_object_addr =
- irb_.CreateLoad(object_type_field_addr, kTBAARuntimeInfo);
+ irb_.CreateLoad(object_type_field_addr, kTBAAJRuntime);
llvm::Value* equal_class =
irb_.CreateICmpEQ(type_object_addr, object_type_object_addr);
@@ -1669,7 +1669,7 @@
irb_.CreateBitCast(object_addr, jobject_ptr_ty->getPointerTo());
llvm::Value* object_type_object_addr =
- irb_.CreateLoad(object_type_field_addr, kTBAARuntimeInfo);
+ irb_.CreateLoad(object_type_field_addr, kTBAAJRuntime);
llvm::Value* equal_class =
irb_.CreateICmpEQ(type_object_addr, object_type_object_addr);
@@ -1698,7 +1698,7 @@
return irb_.LoadFromObjectOffset(array,
Array::LengthOffset().Int32Value(),
irb_.getJIntTy(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
}
@@ -2466,7 +2466,7 @@
llvm::Value* storage_field_addr =
EmitLoadDexCacheStaticStorageFieldAddr(type_idx);
- llvm::Value* storage_object_addr = irb_.CreateLoad(storage_field_addr, kTBAARuntimeInfo);
+ llvm::Value* storage_object_addr = irb_.CreateLoad(storage_field_addr, kTBAAJRuntime);
llvm::BasicBlock* block_original = irb_.GetInsertBlock();
@@ -2565,7 +2565,7 @@
irb_.LoadFromObjectOffset(method_object_addr,
Method::DeclaringClassOffset().Int32Value(),
irb_.getJObjectTy(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
} else {
// Medium path, static storage base in a different class which
// requires checks that the other class is initialized
@@ -2644,7 +2644,7 @@
irb_.LoadFromObjectOffset(method_object_addr,
Method::DeclaringClassOffset().Int32Value(),
irb_.getJObjectTy(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
} else {
// Medium path, static storage base in a different class which
// requires checks that the other class is initialized
@@ -2801,7 +2801,7 @@
irb_.LoadFromObjectOffset(callee_method_object_addr,
Method::GetCodeOffset().Int32Value(),
GetFunctionType(callee_method_idx, is_static)->getPointerTo(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
// Load the actual parameter
std::vector<llvm::Value*> args;
@@ -2926,7 +2926,7 @@
llvm::Value* callee_method_object_field_addr =
EmitLoadDexCacheResolvedMethodFieldAddr(callee_method_idx);
- return irb_.CreateLoad(callee_method_object_field_addr, kTBAARuntimeInfo);
+ return irb_.CreateLoad(callee_method_object_field_addr, kTBAAJRuntime);
}
@@ -2938,14 +2938,14 @@
irb_.LoadFromObjectOffset(this_addr,
Object::ClassOffset().Int32Value(),
irb_.getJObjectTy(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
// Load vtable address
llvm::Value* vtable_addr =
irb_.LoadFromObjectOffset(class_object_addr,
Class::VTableOffset().Int32Value(),
irb_.getJObjectTy(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
// Load callee method object
llvm::Value* vtable_idx_value =
@@ -2954,7 +2954,7 @@
llvm::Value* method_field_addr =
EmitArrayGEP(vtable_addr, vtable_idx_value, irb_.getJObjectTy(), kObject);
- return irb_.CreateLoad(method_field_addr, kTBAARuntimeInfo);
+ return irb_.CreateLoad(method_field_addr, kTBAAJRuntime);
}
@@ -3555,7 +3555,7 @@
return irb_.LoadFromObjectOffset(method_object_addr,
offset.Int32Value(),
irb_.getJObjectTy(),
- kTBAARuntimeInfo);
+ kTBAAJRuntime);
}