Fix cpplint build/namespaces issues
Change-Id: I19c68703270c1482d6c6aad8cdf97d3d2924360a
diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index 7fd1a7c..f395428 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -52,7 +52,14 @@
#include "UniquePtr.h"
#include "utils.h"
-using namespace art::mirror;
+using ::art::mirror::AbstractMethod;
+using ::art::mirror::Class;
+using ::art::mirror::DexCache;
+using ::art::mirror::EntryPointFromInterpreter;
+using ::art::mirror::Field;
+using ::art::mirror::Object;
+using ::art::mirror::ObjectArray;
+using ::art::mirror::String;
namespace art {
diff --git a/compiler/jni/portable/jni_compiler.cc b/compiler/jni/portable/jni_compiler.cc
index 57b8a31..0e58378 100644
--- a/compiler/jni/portable/jni_compiler.cc
+++ b/compiler/jni/portable/jni_compiler.cc
@@ -41,7 +41,13 @@
namespace art {
namespace llvm {
-using namespace runtime_support;
+using ::art::llvm::runtime_support::JniMethodEnd;
+using ::art::llvm::runtime_support::JniMethodEndSynchronized;
+using ::art::llvm::runtime_support::JniMethodEndWithReference;
+using ::art::llvm::runtime_support::JniMethodEndWithReferenceSynchronized;
+using ::art::llvm::runtime_support::JniMethodStart;
+using ::art::llvm::runtime_support::JniMethodStartSynchronized;
+using ::art::llvm::runtime_support::RuntimeId;
JniCompiler::JniCompiler(LlvmCompilationUnit* cunit,
const CompilerDriver& driver,
diff --git a/compiler/llvm/gbc_expander.cc b/compiler/llvm/gbc_expander.cc
index 94cc973..a2c6998 100644
--- a/compiler/llvm/gbc_expander.cc
+++ b/compiler/llvm/gbc_expander.cc
@@ -30,8 +30,6 @@
#include "dex/compiler_ir.h"
#include "dex/mir_graph.h"
#include "dex/quick/mir_to_lir.h"
-using art::kMIRIgnoreNullCheck;
-using art::kMIRIgnoreRangeCheck;
#include <llvm/ADT/STLExtras.h>
#include <llvm/IR/Intrinsics.h>
@@ -44,13 +42,78 @@
#include <map>
#include <utility>
-using namespace art::llvm;
-
-using art::llvm::IntrinsicHelper;
+using ::art::kMIRIgnoreNullCheck;
+using ::art::kMIRIgnoreRangeCheck;
+using ::art::llvm::IRBuilder;
+using ::art::llvm::IntrinsicHelper;
+using ::art::llvm::JType;
+using ::art::llvm::RuntimeSupportBuilder;
+using ::art::llvm::kBoolean;
+using ::art::llvm::kByte;
+using ::art::llvm::kChar;
+using ::art::llvm::kDouble;
+using ::art::llvm::kFloat;
+using ::art::llvm::kInt;
+using ::art::llvm::kLikely;
+using ::art::llvm::kLong;
+using ::art::llvm::kObject;
+using ::art::llvm::kShort;
+using ::art::llvm::kTBAAConstJObject;
+using ::art::llvm::kTBAAHeapArray;
+using ::art::llvm::kTBAAHeapInstance;
+using ::art::llvm::kTBAAHeapStatic;
+using ::art::llvm::kTBAARegister;
+using ::art::llvm::kTBAARuntimeInfo;
+using ::art::llvm::kTBAAShadowFrame;
+using ::art::llvm::kUnlikely;
+using ::art::llvm::kVoid;
+using ::art::llvm::runtime_support::AllocArray;
+using ::art::llvm::runtime_support::AllocArrayWithAccessCheck;
+using ::art::llvm::runtime_support::AllocObject;
+using ::art::llvm::runtime_support::AllocObjectWithAccessCheck;
+using ::art::llvm::runtime_support::CheckAndAllocArray;
+using ::art::llvm::runtime_support::CheckAndAllocArrayWithAccessCheck;
+using ::art::llvm::runtime_support::CheckCast;
+using ::art::llvm::runtime_support::CheckPutArrayElement;
+using ::art::llvm::runtime_support::FillArrayData;
+using ::art::llvm::runtime_support::FindCatchBlock;
+using ::art::llvm::runtime_support::FindDirectMethodWithAccessCheck;
+using ::art::llvm::runtime_support::FindInterfaceMethod;
+using ::art::llvm::runtime_support::FindInterfaceMethodWithAccessCheck;
+using ::art::llvm::runtime_support::FindStaticMethodWithAccessCheck;
+using ::art::llvm::runtime_support::FindSuperMethodWithAccessCheck;
+using ::art::llvm::runtime_support::FindVirtualMethodWithAccessCheck;
+using ::art::llvm::runtime_support::Get32Instance;
+using ::art::llvm::runtime_support::Get32Static;
+using ::art::llvm::runtime_support::Get64Instance;
+using ::art::llvm::runtime_support::Get64Static;
+using ::art::llvm::runtime_support::GetObjectInstance;
+using ::art::llvm::runtime_support::GetObjectStatic;
+using ::art::llvm::runtime_support::InitializeStaticStorage;
+using ::art::llvm::runtime_support::InitializeType;
+using ::art::llvm::runtime_support::InitializeTypeAndVerifyAccess;
+using ::art::llvm::runtime_support::IsAssignable;
+using ::art::llvm::runtime_support::ResolveString;
+using ::art::llvm::runtime_support::RuntimeId;
+using ::art::llvm::runtime_support::Set32Instance;
+using ::art::llvm::runtime_support::Set32Static;
+using ::art::llvm::runtime_support::Set64Instance;
+using ::art::llvm::runtime_support::Set64Static;
+using ::art::llvm::runtime_support::SetObjectInstance;
+using ::art::llvm::runtime_support::SetObjectStatic;
+using ::art::llvm::runtime_support::ThrowDivZeroException;
+using ::art::llvm::runtime_support::ThrowException;
+using ::art::llvm::runtime_support::ThrowIndexOutOfBounds;
+using ::art::llvm::runtime_support::ThrowNullPointerException;
+using ::art::llvm::runtime_support::ThrowStackOverflowException;
+using ::art::llvm::runtime_support::art_d2i;
+using ::art::llvm::runtime_support::art_d2l;
+using ::art::llvm::runtime_support::art_f2i;
+using ::art::llvm::runtime_support::art_f2l;
namespace art {
extern char RemapShorty(char shortyType);
-};
+} // namespace art
namespace {
@@ -101,8 +164,7 @@
// Helper function for GBC expansion
//----------------------------------------------------------------------------
- llvm::Value* ExpandToRuntime(runtime_support::RuntimeId rt,
- llvm::CallInst& inst);
+ llvm::Value* ExpandToRuntime(RuntimeId rt, llvm::CallInst& inst);
uint64_t LV2UInt(llvm::Value* lv) {
return llvm::cast<llvm::ConstantInt>(lv)->getZExtValue();
@@ -580,8 +642,7 @@
}
}
-llvm::Value* GBCExpanderPass::ExpandToRuntime(runtime_support::RuntimeId rt,
- llvm::CallInst& inst) {
+llvm::Value* GBCExpanderPass::ExpandToRuntime(RuntimeId rt, llvm::CallInst& inst) {
// Some GBC intrinsic can directly replace with IBC runtime. "Directly" means
// the arguments passed to the GBC intrinsic are as the same as IBC runtime
// function, therefore only called function is needed to change.
@@ -633,7 +694,7 @@
// If stack overflow, throw exception.
irb_.SetInsertPoint(block_exception);
- irb_.CreateCall(irb_.GetRuntime(runtime_support::ThrowStackOverflowException));
+ irb_.CreateCall(irb_.GetRuntime(ThrowStackOverflowException));
// Unwind.
llvm::Type* ret_type = func->getReturnType();
@@ -1541,7 +1602,7 @@
llvm::Value* array_elem_addr = EmitArrayGEP(array_addr, index_value, elem_jty);
if (elem_jty == kObject) { // If put an object, check the type, and mark GC card table.
- llvm::Function* runtime_func = irb_.GetRuntime(runtime_support::CheckPutArrayElement);
+ llvm::Function* runtime_func = irb_.GetRuntime(CheckPutArrayElement);
irb_.CreateCall2(runtime_func, new_value, array_addr);
@@ -1575,11 +1636,11 @@
llvm::Function* runtime_func;
if (field_jty == kObject) {
- runtime_func = irb_.GetRuntime(runtime_support::GetObjectInstance);
+ runtime_func = irb_.GetRuntime(GetObjectInstance);
} else if (field_jty == kLong || field_jty == kDouble) {
- runtime_func = irb_.GetRuntime(runtime_support::Get64Instance);
+ runtime_func = irb_.GetRuntime(Get64Instance);
} else {
- runtime_func = irb_.GetRuntime(runtime_support::Get32Instance);
+ runtime_func = irb_.GetRuntime(Get32Instance);
}
llvm::ConstantInt* field_idx_value = irb_.getInt32(field_idx);
@@ -1643,11 +1704,11 @@
}
if (field_jty == kObject) {
- runtime_func = irb_.GetRuntime(runtime_support::SetObjectInstance);
+ runtime_func = irb_.GetRuntime(SetObjectInstance);
} else if (field_jty == kLong || field_jty == kDouble) {
- runtime_func = irb_.GetRuntime(runtime_support::Set64Instance);
+ runtime_func = irb_.GetRuntime(Set64Instance);
} else {
- runtime_func = irb_.GetRuntime(runtime_support::Set32Instance);
+ runtime_func = irb_.GetRuntime(Set32Instance);
}
llvm::Value* field_idx_value = irb_.getInt32(field_idx);
@@ -1701,8 +1762,7 @@
llvm::Value* thread_object_addr = irb_.Runtime().EmitGetCurrentThread();
- llvm::Function* runtime_func =
- irb_.GetRuntime(runtime_support::InitializeTypeAndVerifyAccess);
+ llvm::Function* runtime_func = irb_.GetRuntime(InitializeTypeAndVerifyAccess);
EmitUpdateDexPC(dex_pc);
@@ -1741,7 +1801,7 @@
// Failback routine to load the class object
irb_.SetInsertPoint(block_load_class);
- llvm::Function* runtime_func = irb_.GetRuntime(runtime_support::InitializeType);
+ llvm::Function* runtime_func = irb_.GetRuntime(InitializeType);
llvm::Constant* type_idx_value = irb_.getInt32(type_idx);
@@ -1796,7 +1856,7 @@
// Failback routine to load the class object
irb_.SetInsertPoint(block_load_static);
- llvm::Function* runtime_func = irb_.GetRuntime(runtime_support::InitializeStaticStorage);
+ llvm::Function* runtime_func = irb_.GetRuntime(InitializeStaticStorage);
llvm::Constant* type_idx_value = irb_.getInt32(type_idx);
@@ -1846,11 +1906,11 @@
llvm::Function* runtime_func;
if (field_jty == kObject) {
- runtime_func = irb_.GetRuntime(runtime_support::GetObjectStatic);
+ runtime_func = irb_.GetRuntime(GetObjectStatic);
} else if (field_jty == kLong || field_jty == kDouble) {
- runtime_func = irb_.GetRuntime(runtime_support::Get64Static);
+ runtime_func = irb_.GetRuntime(Get64Static);
} else {
- runtime_func = irb_.GetRuntime(runtime_support::Get32Static);
+ runtime_func = irb_.GetRuntime(Get32Static);
}
llvm::Constant* field_idx_value = irb_.getInt32(field_idx);
@@ -1928,11 +1988,11 @@
llvm::Function* runtime_func;
if (field_jty == kObject) {
- runtime_func = irb_.GetRuntime(runtime_support::SetObjectStatic);
+ runtime_func = irb_.GetRuntime(SetObjectStatic);
} else if (field_jty == kLong || field_jty == kDouble) {
- runtime_func = irb_.GetRuntime(runtime_support::Set64Static);
+ runtime_func = irb_.GetRuntime(Set64Static);
} else {
- runtime_func = irb_.GetRuntime(runtime_support::Set32Static);
+ runtime_func = irb_.GetRuntime(Set32Static);
}
if (field_jty == kFloat) {
@@ -2029,7 +2089,7 @@
// String is not resolved yet, resolve it now.
irb_.SetInsertPoint(block_str_resolve);
- llvm::Function* runtime_func = irb_.GetRuntime(runtime_support::ResolveString);
+ llvm::Function* runtime_func = irb_.GetRuntime(ResolveString);
llvm::Value* method_object_addr = EmitLoadMethodObjectAddr();
@@ -2141,7 +2201,7 @@
EmitUpdateDexPC(dex_pc);
- irb_.CreateCall2(irb_.GetRuntime(runtime_support::CheckCast),
+ irb_.CreateCall2(irb_.GetRuntime(CheckCast),
type_object_addr, object_type_object_addr);
EmitGuard_ExceptionLandingPad(dex_pc);
@@ -2209,7 +2269,7 @@
// Test: Is the object instantiated from the subclass of the given class?
irb_.SetInsertPoint(block_test_sub_class);
llvm::Value* result =
- irb_.CreateCall2(irb_.GetRuntime(runtime_support::IsAssignable),
+ irb_.CreateCall2(irb_.GetRuntime(IsAssignable),
type_object_addr, object_type_object_addr);
irb_.CreateBr(block_cont);
@@ -2232,9 +2292,9 @@
if (driver_->CanAccessInstantiableTypeWithoutChecks(dex_compilation_unit_->GetDexMethodIndex(),
*dex_compilation_unit_->GetDexFile(),
type_idx)) {
- runtime_func = irb_.GetRuntime(runtime_support::AllocObject);
+ runtime_func = irb_.GetRuntime(AllocObject);
} else {
- runtime_func = irb_.GetRuntime(runtime_support::AllocObjectWithAccessCheck);
+ runtime_func = irb_.GetRuntime(AllocObjectWithAccessCheck);
}
llvm::Constant* type_index_value = irb_.getInt32(type_idx);
@@ -2373,7 +2433,7 @@
// NOTE: We will check for the NullPointerException in the runtime.
- llvm::Function* runtime_func = irb_.GetRuntime(runtime_support::FillArrayData);
+ llvm::Function* runtime_func = irb_.GetRuntime(FillArrayData);
llvm::Value* method_object_addr = EmitLoadMethodObjectAddr();
@@ -2402,12 +2462,12 @@
if (is_filled_new_array) {
runtime_func = skip_access_check ?
- irb_.GetRuntime(runtime_support::CheckAndAllocArray) :
- irb_.GetRuntime(runtime_support::CheckAndAllocArrayWithAccessCheck);
+ irb_.GetRuntime(CheckAndAllocArray) :
+ irb_.GetRuntime(CheckAndAllocArrayWithAccessCheck);
} else {
runtime_func = skip_access_check ?
- irb_.GetRuntime(runtime_support::AllocArray) :
- irb_.GetRuntime(runtime_support::AllocArrayWithAccessCheck);
+ irb_.GetRuntime(AllocArray) :
+ irb_.GetRuntime(AllocArrayWithAccessCheck);
}
llvm::Constant* type_index_value = irb_.getInt32(type_idx);
@@ -2437,26 +2497,26 @@
switch (invoke_type) {
case art::kStatic:
- runtime_func = irb_.GetRuntime(runtime_support::FindStaticMethodWithAccessCheck);
+ runtime_func = irb_.GetRuntime(FindStaticMethodWithAccessCheck);
break;
case art::kDirect:
- runtime_func = irb_.GetRuntime(runtime_support::FindDirectMethodWithAccessCheck);
+ runtime_func = irb_.GetRuntime(FindDirectMethodWithAccessCheck);
break;
case art::kVirtual:
- runtime_func = irb_.GetRuntime(runtime_support::FindVirtualMethodWithAccessCheck);
+ runtime_func = irb_.GetRuntime(FindVirtualMethodWithAccessCheck);
break;
case art::kSuper:
- runtime_func = irb_.GetRuntime(runtime_support::FindSuperMethodWithAccessCheck);
+ runtime_func = irb_.GetRuntime(FindSuperMethodWithAccessCheck);
break;
case art::kInterface:
if (is_fast_path) {
- runtime_func = irb_.GetRuntime(runtime_support::FindInterfaceMethod);
+ runtime_func = irb_.GetRuntime(FindInterfaceMethod);
} else {
- runtime_func = irb_.GetRuntime(runtime_support::FindInterfaceMethodWithAccessCheck);
+ runtime_func = irb_.GetRuntime(FindInterfaceMethodWithAccessCheck);
}
break;
}
@@ -2518,7 +2578,7 @@
irb_.SetInsertPoint(block_exception);
EmitUpdateDexPC(dex_pc);
- irb_.CreateCall(irb_.GetRuntime(runtime_support::ThrowDivZeroException));
+ irb_.CreateCall(irb_.GetRuntime(ThrowDivZeroException));
EmitBranchExceptionLandingPad(dex_pc);
irb_.SetInsertPoint(block_continue);
@@ -2557,7 +2617,7 @@
irb_.SetInsertPoint(block_exception);
EmitUpdateDexPC(dex_pc);
- irb_.CreateCall(irb_.GetRuntime(runtime_support::ThrowNullPointerException),
+ irb_.CreateCall(irb_.GetRuntime(ThrowNullPointerException),
irb_.getInt32(dex_pc));
EmitBranchExceptionLandingPad(dex_pc);
@@ -2603,7 +2663,7 @@
irb_.SetInsertPoint(block_exception);
EmitUpdateDexPC(dex_pc);
- irb_.CreateCall2(irb_.GetRuntime(runtime_support::ThrowIndexOutOfBounds), index, array_len);
+ irb_.CreateCall2(irb_.GetRuntime(ThrowIndexOutOfBounds), index, array_len);
EmitBranchExceptionLandingPad(dex_pc);
irb_.SetInsertPoint(block_continue);
@@ -2720,7 +2780,7 @@
llvm::Value* ti_offset_value = irb_.getInt32(ti_offset);
llvm::Value* catch_handler_index_value =
- irb_.CreateCall2(irb_.GetRuntime(runtime_support::FindCatchBlock),
+ irb_.CreateCall2(irb_.GetRuntime(FindCatchBlock),
method_object_addr, ti_offset_value);
// Switch instruction (Go to unwind basic block by default)
@@ -2825,14 +2885,14 @@
//==- Exception --------------------------------------------------------==//
case IntrinsicHelper::ThrowException: {
- return ExpandToRuntime(runtime_support::ThrowException, call_inst);
+ return ExpandToRuntime(ThrowException, call_inst);
}
case IntrinsicHelper::HLThrowException: {
uint32_t dex_pc = LV2UInt(call_inst.getMetadata("DexOff")->getOperand(0));
EmitUpdateDexPC(dex_pc);
- irb_.CreateCall(irb_.GetRuntime(runtime_support::ThrowException),
+ irb_.CreateCall(irb_.GetRuntime(ThrowException),
call_inst.getArgOperand(0));
EmitGuard_ExceptionLandingPad(dex_pc);
@@ -2845,16 +2905,16 @@
return irb_.Runtime().EmitIsExceptionPending();
}
case IntrinsicHelper::FindCatchBlock: {
- return ExpandToRuntime(runtime_support::FindCatchBlock, call_inst);
+ return ExpandToRuntime(FindCatchBlock, call_inst);
}
case IntrinsicHelper::ThrowDivZeroException: {
- return ExpandToRuntime(runtime_support::ThrowDivZeroException, call_inst);
+ return ExpandToRuntime(ThrowDivZeroException, call_inst);
}
case IntrinsicHelper::ThrowNullPointerException: {
- return ExpandToRuntime(runtime_support::ThrowNullPointerException, call_inst);
+ return ExpandToRuntime(ThrowNullPointerException, call_inst);
}
case IntrinsicHelper::ThrowIndexOutOfBounds: {
- return ExpandToRuntime(runtime_support::ThrowIndexOutOfBounds, call_inst);
+ return ExpandToRuntime(ThrowIndexOutOfBounds, call_inst);
}
//==- Const String -----------------------------------------------------==//
@@ -2865,7 +2925,7 @@
return Expand_LoadStringFromDexCache(call_inst.getArgOperand(0));
}
case IntrinsicHelper::ResolveString: {
- return ExpandToRuntime(runtime_support::ResolveString, call_inst);
+ return ExpandToRuntime(ResolveString, call_inst);
}
//==- Const Class ------------------------------------------------------==//
@@ -2873,13 +2933,13 @@
return Expand_ConstClass(call_inst);
}
case IntrinsicHelper::InitializeTypeAndVerifyAccess: {
- return ExpandToRuntime(runtime_support::InitializeTypeAndVerifyAccess, call_inst);
+ return ExpandToRuntime(InitializeTypeAndVerifyAccess, call_inst);
}
case IntrinsicHelper::LoadTypeFromDexCache: {
return Expand_LoadTypeFromDexCache(call_inst.getArgOperand(0));
}
case IntrinsicHelper::InitializeType: {
- return ExpandToRuntime(runtime_support::InitializeType, call_inst);
+ return ExpandToRuntime(InitializeType, call_inst);
}
//==- Lock -------------------------------------------------------------==//
@@ -2894,22 +2954,22 @@
//==- Cast -------------------------------------------------------------==//
case IntrinsicHelper::CheckCast: {
- return ExpandToRuntime(runtime_support::CheckCast, call_inst);
+ return ExpandToRuntime(CheckCast, call_inst);
}
case IntrinsicHelper::HLCheckCast: {
Expand_HLCheckCast(call_inst);
return NULL;
}
case IntrinsicHelper::IsAssignable: {
- return ExpandToRuntime(runtime_support::IsAssignable, call_inst);
+ return ExpandToRuntime(IsAssignable, call_inst);
}
//==- Alloc ------------------------------------------------------------==//
case IntrinsicHelper::AllocObject: {
- return ExpandToRuntime(runtime_support::AllocObject, call_inst);
+ return ExpandToRuntime(AllocObject, call_inst);
}
case IntrinsicHelper::AllocObjectWithAccessCheck: {
- return ExpandToRuntime(runtime_support::AllocObjectWithAccessCheck, call_inst);
+ return ExpandToRuntime(AllocObjectWithAccessCheck, call_inst);
}
//==- Instance ---------------------------------------------------------==//
@@ -2931,17 +2991,17 @@
return EmitLoadArrayLength(call_inst.getArgOperand(0));
}
case IntrinsicHelper::AllocArray: {
- return ExpandToRuntime(runtime_support::AllocArray, call_inst);
+ return ExpandToRuntime(AllocArray, call_inst);
}
case IntrinsicHelper::AllocArrayWithAccessCheck: {
- return ExpandToRuntime(runtime_support::AllocArrayWithAccessCheck,
+ return ExpandToRuntime(AllocArrayWithAccessCheck,
call_inst);
}
case IntrinsicHelper::CheckAndAllocArray: {
- return ExpandToRuntime(runtime_support::CheckAndAllocArray, call_inst);
+ return ExpandToRuntime(CheckAndAllocArray, call_inst);
}
case IntrinsicHelper::CheckAndAllocArrayWithAccessCheck: {
- return ExpandToRuntime(runtime_support::CheckAndAllocArrayWithAccessCheck,
+ return ExpandToRuntime(CheckAndAllocArrayWithAccessCheck,
call_inst);
}
case IntrinsicHelper::ArrayGet: {
@@ -3029,14 +3089,14 @@
return NULL;
}
case IntrinsicHelper::CheckPutArrayElement: {
- return ExpandToRuntime(runtime_support::CheckPutArrayElement, call_inst);
+ return ExpandToRuntime(CheckPutArrayElement, call_inst);
}
case IntrinsicHelper::FilledNewArray: {
Expand_FilledNewArray(call_inst);
return NULL;
}
case IntrinsicHelper::FillArrayData: {
- return ExpandToRuntime(runtime_support::FillArrayData, call_inst);
+ return ExpandToRuntime(FillArrayData, call_inst);
}
case IntrinsicHelper::HLFillArrayData: {
Expand_HLFillArrayData(call_inst);
@@ -3052,13 +3112,13 @@
case IntrinsicHelper::InstanceFieldGetByte:
case IntrinsicHelper::InstanceFieldGetChar:
case IntrinsicHelper::InstanceFieldGetShort: {
- return ExpandToRuntime(runtime_support::Get32Instance, call_inst);
+ return ExpandToRuntime(Get32Instance, call_inst);
}
case IntrinsicHelper::InstanceFieldGetWide: {
- return ExpandToRuntime(runtime_support::Get64Instance, call_inst);
+ return ExpandToRuntime(Get64Instance, call_inst);
}
case IntrinsicHelper::InstanceFieldGetObject: {
- return ExpandToRuntime(runtime_support::GetObjectInstance, call_inst);
+ return ExpandToRuntime(GetObjectInstance, call_inst);
}
case IntrinsicHelper::InstanceFieldGetFast: {
return Expand_IGetFast(call_inst.getArgOperand(0),
@@ -3107,13 +3167,13 @@
case IntrinsicHelper::InstanceFieldPutByte:
case IntrinsicHelper::InstanceFieldPutChar:
case IntrinsicHelper::InstanceFieldPutShort: {
- return ExpandToRuntime(runtime_support::Set32Instance, call_inst);
+ return ExpandToRuntime(Set32Instance, call_inst);
}
case IntrinsicHelper::InstanceFieldPutWide: {
- return ExpandToRuntime(runtime_support::Set64Instance, call_inst);
+ return ExpandToRuntime(Set64Instance, call_inst);
}
case IntrinsicHelper::InstanceFieldPutObject: {
- return ExpandToRuntime(runtime_support::SetObjectInstance, call_inst);
+ return ExpandToRuntime(SetObjectInstance, call_inst);
}
case IntrinsicHelper::InstanceFieldPutFast: {
Expand_IPutFast(call_inst.getArgOperand(0),
@@ -3178,13 +3238,13 @@
case IntrinsicHelper::StaticFieldGetByte:
case IntrinsicHelper::StaticFieldGetChar:
case IntrinsicHelper::StaticFieldGetShort: {
- return ExpandToRuntime(runtime_support::Get32Static, call_inst);
+ return ExpandToRuntime(Get32Static, call_inst);
}
case IntrinsicHelper::StaticFieldGetWide: {
- return ExpandToRuntime(runtime_support::Get64Static, call_inst);
+ return ExpandToRuntime(Get64Static, call_inst);
}
case IntrinsicHelper::StaticFieldGetObject: {
- return ExpandToRuntime(runtime_support::GetObjectStatic, call_inst);
+ return ExpandToRuntime(GetObjectStatic, call_inst);
}
case IntrinsicHelper::StaticFieldGetFast: {
return Expand_SGetFast(call_inst.getArgOperand(0),
@@ -3233,13 +3293,13 @@
case IntrinsicHelper::StaticFieldPutByte:
case IntrinsicHelper::StaticFieldPutChar:
case IntrinsicHelper::StaticFieldPutShort: {
- return ExpandToRuntime(runtime_support::Set32Static, call_inst);
+ return ExpandToRuntime(Set32Static, call_inst);
}
case IntrinsicHelper::StaticFieldPutWide: {
- return ExpandToRuntime(runtime_support::Set64Static, call_inst);
+ return ExpandToRuntime(Set64Static, call_inst);
}
case IntrinsicHelper::StaticFieldPutObject: {
- return ExpandToRuntime(runtime_support::SetObjectStatic, call_inst);
+ return ExpandToRuntime(SetObjectStatic, call_inst);
}
case IntrinsicHelper::StaticFieldPutFast: {
Expand_SPutFast(call_inst.getArgOperand(0),
@@ -3304,7 +3364,7 @@
return Expand_LoadClassSSBFromDexCache(call_inst.getArgOperand(0));
}
case IntrinsicHelper::InitializeAndLoadClassSSB: {
- return ExpandToRuntime(runtime_support::InitializeStaticStorage, call_inst);
+ return ExpandToRuntime(InitializeStaticStorage, call_inst);
}
//==- High-level Array -------------------------------------------------==//
@@ -3449,19 +3509,19 @@
//==- Invoke -----------------------------------------------------------==//
case IntrinsicHelper::FindStaticMethodWithAccessCheck: {
- return ExpandToRuntime(runtime_support::FindStaticMethodWithAccessCheck, call_inst);
+ return ExpandToRuntime(FindStaticMethodWithAccessCheck, call_inst);
}
case IntrinsicHelper::FindDirectMethodWithAccessCheck: {
- return ExpandToRuntime(runtime_support::FindDirectMethodWithAccessCheck, call_inst);
+ return ExpandToRuntime(FindDirectMethodWithAccessCheck, call_inst);
}
case IntrinsicHelper::FindVirtualMethodWithAccessCheck: {
- return ExpandToRuntime(runtime_support::FindVirtualMethodWithAccessCheck, call_inst);
+ return ExpandToRuntime(FindVirtualMethodWithAccessCheck, call_inst);
}
case IntrinsicHelper::FindSuperMethodWithAccessCheck: {
- return ExpandToRuntime(runtime_support::FindSuperMethodWithAccessCheck, call_inst);
+ return ExpandToRuntime(FindSuperMethodWithAccessCheck, call_inst);
}
case IntrinsicHelper::FindInterfaceMethodWithAccessCheck: {
- return ExpandToRuntime(runtime_support::FindInterfaceMethodWithAccessCheck, call_inst);
+ return ExpandToRuntime(FindInterfaceMethodWithAccessCheck, call_inst);
}
case IntrinsicHelper::GetSDCalleeMethodObjAddrFast: {
return Expand_GetSDCalleeMethodObjAddrFast(call_inst.getArgOperand(0));
@@ -3471,7 +3531,7 @@
call_inst.getArgOperand(0), call_inst.getArgOperand(1));
}
case IntrinsicHelper::GetInterfaceCalleeMethodObjAddrFast: {
- return ExpandToRuntime(runtime_support::FindInterfaceMethod, call_inst);
+ return ExpandToRuntime(FindInterfaceMethod, call_inst);
}
case IntrinsicHelper::InvokeRetVoid:
case IntrinsicHelper::InvokeRetBoolean:
@@ -3500,16 +3560,16 @@
return Expand_DivRem(call_inst, /* is_div */false, kLong);
}
case IntrinsicHelper::D2L: {
- return ExpandToRuntime(runtime_support::art_d2l, call_inst);
+ return ExpandToRuntime(art_d2l, call_inst);
}
case IntrinsicHelper::D2I: {
- return ExpandToRuntime(runtime_support::art_d2i, call_inst);
+ return ExpandToRuntime(art_d2i, call_inst);
}
case IntrinsicHelper::F2L: {
- return ExpandToRuntime(runtime_support::art_f2l, call_inst);
+ return ExpandToRuntime(art_f2l, call_inst);
}
case IntrinsicHelper::F2I: {
- return ExpandToRuntime(runtime_support::art_f2i, call_inst);
+ return ExpandToRuntime(art_f2i, call_inst);
}
//==- High-level Static ------------------------------------------------==//
diff --git a/compiler/llvm/runtime_support_builder.cc b/compiler/llvm/runtime_support_builder.cc
index 976aa8f..19ccc36 100644
--- a/compiler/llvm/runtime_support_builder.cc
+++ b/compiler/llvm/runtime_support_builder.cc
@@ -27,14 +27,14 @@
#include <llvm/IR/Module.h>
#include <llvm/IR/Type.h>
-using namespace llvm;
+using ::llvm::BasicBlock;
+using ::llvm::CallInst;
+using ::llvm::Function;
+using ::llvm::Value;
namespace art {
namespace llvm {
-using namespace runtime_support;
-
-
RuntimeSupportBuilder::RuntimeSupportBuilder(::llvm::LLVMContext& context,
::llvm::Module& module,
IRBuilder& irb)
diff --git a/compiler/llvm/runtime_support_builder_arm.cc b/compiler/llvm/runtime_support_builder_arm.cc
index 57a9971..5a9d2b8 100644
--- a/compiler/llvm/runtime_support_builder_arm.cc
+++ b/compiler/llvm/runtime_support_builder_arm.cc
@@ -28,11 +28,17 @@
#include <vector>
-using namespace llvm;
+using ::llvm::CallInst;
+using ::llvm::Function;
+using ::llvm::FunctionType;
+using ::llvm::InlineAsm;
+using ::llvm::IntegerType;
+using ::llvm::Type;
+using ::llvm::Value;
namespace {
-char LDRSTRSuffixByType(art::llvm::IRBuilder& irb, ::llvm::Type* type) {
+char LDRSTRSuffixByType(art::llvm::IRBuilder& irb, Type* type) {
int width = type->isPointerTy() ?
irb.getSizeOfPtrEquivInt()*8 :
::llvm::cast<IntegerType>(type)->getBitWidth();
@@ -53,7 +59,7 @@
/* Thread */
-::llvm::Value* RuntimeSupportBuilderARM::EmitGetCurrentThread() {
+Value* RuntimeSupportBuilderARM::EmitGetCurrentThread() {
Function* ori_func = GetRuntimeSupportFunction(runtime_support::GetCurrentThread);
InlineAsm* func = InlineAsm::get(ori_func->getFunctionType(), "mov $0, r9", "=r", false);
CallInst* thread = irb_.CreateCall(func);
@@ -62,8 +68,8 @@
return thread;
}
-::llvm::Value* RuntimeSupportBuilderARM::EmitLoadFromThreadOffset(int64_t offset, ::llvm::Type* type,
- TBAASpecialType s_ty) {
+Value* RuntimeSupportBuilderARM::EmitLoadFromThreadOffset(int64_t offset, ::llvm::Type* type,
+ TBAASpecialType s_ty) {
FunctionType* func_ty = FunctionType::get(/*Result=*/type,
/*isVarArg=*/false);
std::string inline_asm(StringPrintf("ldr%c $0, [r9, #%d]",
@@ -76,7 +82,7 @@
return result;
}
-void RuntimeSupportBuilderARM::EmitStoreToThreadOffset(int64_t offset, ::llvm::Value* value,
+void RuntimeSupportBuilderARM::EmitStoreToThreadOffset(int64_t offset, Value* value,
TBAASpecialType s_ty) {
FunctionType* func_ty = FunctionType::get(/*Result=*/Type::getVoidTy(context_),
/*Params=*/value->getType(),
@@ -89,8 +95,7 @@
irb_.SetTBAA(call_inst, s_ty);
}
-::llvm::Value*
-RuntimeSupportBuilderARM::EmitSetCurrentThread(::llvm::Value* thread) {
+Value* RuntimeSupportBuilderARM::EmitSetCurrentThread(Value* thread) {
// Separate to two InlineAsm: The first one produces the return value, while the second,
// sets the current thread.
// LLVM can delete the first one if the caller in LLVM IR doesn't use the return value.
@@ -114,7 +119,7 @@
/* Monitor */
-void RuntimeSupportBuilderARM::EmitLockObject(::llvm::Value* object) {
+void RuntimeSupportBuilderARM::EmitLockObject(Value* object) {
RuntimeSupportBuilder::EmitLockObject(object);
FunctionType* func_ty = FunctionType::get(/*Result=*/Type::getVoidTy(context_),
/*isVarArg=*/false);
@@ -122,7 +127,7 @@
irb_.CreateCall(func);
}
-void RuntimeSupportBuilderARM::EmitUnlockObject(::llvm::Value* object) {
+void RuntimeSupportBuilderARM::EmitUnlockObject(Value* object) {
RuntimeSupportBuilder::EmitUnlockObject(object);
FunctionType* func_ty = FunctionType::get(/*Result=*/Type::getVoidTy(context_),
/*isVarArg=*/false);
diff --git a/compiler/llvm/runtime_support_builder_thumb2.cc b/compiler/llvm/runtime_support_builder_thumb2.cc
index 2b9170c..b8a5f05 100644
--- a/compiler/llvm/runtime_support_builder_thumb2.cc
+++ b/compiler/llvm/runtime_support_builder_thumb2.cc
@@ -31,13 +31,18 @@
#include <inttypes.h>
#include <vector>
-using namespace llvm;
+using ::llvm::BasicBlock;
+using ::llvm::Function;
+using ::llvm::FunctionType;
+using ::llvm::InlineAsm;
+using ::llvm::Type;
+using ::llvm::Value;
namespace art {
namespace llvm {
-void RuntimeSupportBuilderThumb2::EmitLockObject(::llvm::Value* object) {
+void RuntimeSupportBuilderThumb2::EmitLockObject(Value* object) {
FunctionType* func_ty = FunctionType::get(/*Result=*/irb_.getInt32Ty(),
/*Params=*/irb_.getJObjectTy(),
/*isVarArg=*/false);
@@ -58,10 +63,10 @@
InlineAsm* func = InlineAsm::get(func_ty, asms, "=&l,l,~l,~l", true);
- ::llvm::Value* retry_slow_path = irb_.CreateCall(func, object);
+ Value* retry_slow_path = irb_.CreateCall(func, object);
retry_slow_path = irb_.CreateICmpNE(retry_slow_path, irb_.getJInt(0));
- ::llvm::Function* parent_func = irb_.GetInsertBlock()->getParent();
+ Function* parent_func = irb_.GetInsertBlock()->getParent();
BasicBlock* basic_block_lock = BasicBlock::Create(context_, "lock", parent_func);
BasicBlock* basic_block_cont = BasicBlock::Create(context_, "lock_cont", parent_func);
irb_.CreateCondBr(retry_slow_path, basic_block_lock, basic_block_cont, kUnlikely);
diff --git a/compiler/llvm/runtime_support_builder_x86.cc b/compiler/llvm/runtime_support_builder_x86.cc
index eed0b63..c056e58 100644
--- a/compiler/llvm/runtime_support_builder_x86.cc
+++ b/compiler/llvm/runtime_support_builder_x86.cc
@@ -29,13 +29,19 @@
#include <vector>
-using namespace llvm;
+using ::llvm::CallInst;
+using ::llvm::Function;
+using ::llvm::FunctionType;
+using ::llvm::InlineAsm;
+using ::llvm::Type;
+using ::llvm::UndefValue;
+using ::llvm::Value;
namespace art {
namespace llvm {
-::llvm::Value* RuntimeSupportBuilderX86::EmitGetCurrentThread() {
+Value* RuntimeSupportBuilderX86::EmitGetCurrentThread() {
Function* ori_func = GetRuntimeSupportFunction(runtime_support::GetCurrentThread);
std::string inline_asm(StringPrintf("mov %%fs:%d, $0", Thread::SelfOffset().Int32Value()));
InlineAsm* func = InlineAsm::get(ori_func->getFunctionType(), inline_asm, "=r", false);
@@ -45,8 +51,8 @@
return thread;
}
-::llvm::Value* RuntimeSupportBuilderX86::EmitLoadFromThreadOffset(int64_t offset, ::llvm::Type* type,
- TBAASpecialType s_ty) {
+Value* RuntimeSupportBuilderX86::EmitLoadFromThreadOffset(int64_t offset, Type* type,
+ TBAASpecialType s_ty) {
FunctionType* func_ty = FunctionType::get(/*Result=*/type,
/*isVarArg=*/false);
std::string inline_asm(StringPrintf("mov %%fs:%d, $0", static_cast<int>(offset)));
@@ -57,7 +63,7 @@
return result;
}
-void RuntimeSupportBuilderX86::EmitStoreToThreadOffset(int64_t offset, ::llvm::Value* value,
+void RuntimeSupportBuilderX86::EmitStoreToThreadOffset(int64_t offset, Value* value,
TBAASpecialType s_ty) {
FunctionType* func_ty = FunctionType::get(/*Result=*/Type::getVoidTy(context_),
/*Params=*/value->getType(),
@@ -68,9 +74,9 @@
irb_.SetTBAA(call_inst, s_ty);
}
-::llvm::Value* RuntimeSupportBuilderX86::EmitSetCurrentThread(::llvm::Value*) {
+Value* RuntimeSupportBuilderX86::EmitSetCurrentThread(Value*) {
/* Nothing to be done. */
- return ::llvm::UndefValue::get(irb_.getJObjectTy());
+ return UndefValue::get(irb_.getJObjectTy());
}