summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author Logan Chien <loganchien@google.com> 2012-02-24 12:25:29 +0800
committer Shih-wei Liao <sliao@google.com> 2012-02-23 23:43:30 -0800
commit8faf802b7c5e60d9c93be7e331114d7eb3756140 (patch)
tree0ef9b95c61ac79852c44016aad51bc40a760ee6a /src
parentef6ae6ab638f697afca142056fd0bcba7a479105 (diff)
Fix build for incompatible API change: int32_t -> uint32_t.
Change-Id: Iac6c84f32ede87406796c06a846d697c2c5f3772
Diffstat (limited to 'src')
-rw-r--r--src/compiler_llvm/method_compiler.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 572f8d6f62..eed4630f2e 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -111,9 +111,9 @@ llvm::FunctionType* MethodCompiler::GetFunctionType(uint32_t method_idx,
// Get method signature
DexFile::MethodId const& method_id = dex_file_->GetMethodId(method_idx);
- int32_t shorty_size;
+ uint32_t shorty_size;
char const* shorty = dex_file_->GetMethodShorty(method_id, &shorty_size);
- CHECK_GE(shorty_size, 1);
+ CHECK_GE(shorty_size, 1u);
// Get return type
llvm::Type* ret_type = irb_.getJType(shorty[0], kAccurate);
@@ -127,7 +127,7 @@ llvm::FunctionType* MethodCompiler::GetFunctionType(uint32_t method_idx,
args_type.push_back(irb_.getJType('L', kAccurate)); // "this" object pointer
}
- for (int32_t i = 1; i < shorty_size; ++i) {
+ for (uint32_t i = 1; i < shorty_size; ++i) {
args_type.push_back(irb_.getJType(shorty[i], kAccurate));
}
@@ -2671,9 +2671,9 @@ EmitLoadActualParameters(std::vector<llvm::Value*>& args,
DexFile::MethodId const& method_id =
dex_file_->GetMethodId(callee_method_idx);
- int32_t shorty_size;
+ uint32_t shorty_size;
char const* shorty = dex_file_->GetMethodShorty(method_id, &shorty_size);
- CHECK_GE(shorty_size, 1);
+ CHECK_GE(shorty_size, 1u);
// Load argument values according to the shorty (without "this")
uint16_t reg_count = 0;
@@ -2682,7 +2682,7 @@ EmitLoadActualParameters(std::vector<llvm::Value*>& args,
++reg_count; // skip the "this" pointer
}
- for (int32_t i = 1; i < shorty_size; ++i) {
+ for (uint32_t i = 1; i < shorty_size; ++i) {
uint32_t reg_idx = (is_range) ? (dec_insn.vC_ + reg_count)
: (dec_insn.arg_[reg_count]);