diff options
| author | 2016-08-02 03:47:35 +0000 | |
|---|---|---|
| committer | 2016-08-02 03:47:35 +0000 | |
| commit | ba65cc4a71273904294245cb37ce70e5bce797e3 (patch) | |
| tree | d53a7a816ec4c8e5bdbf80729ac945787b27bf2c /compiler/optimizing/code_generator.cc | |
| parent | 1a827a05afbffd5bee241f245f9aa3c40b4dbae4 (diff) | |
| parent | 542451cc546779f5c67840e105c51205a1b0a8fd (diff) | |
Merge "ART: Convert pointer size to enum"
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 3269dc6605..4a4b98cc48 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -137,7 +137,7 @@ size_t CodeGenerator::GetCacheOffset(uint32_t index) { size_t CodeGenerator::GetCachePointerOffset(uint32_t index) { auto pointer_size = InstructionSetPointerSize(GetInstructionSet()); - return pointer_size * index; + return static_cast<size_t>(pointer_size) * index; } uint32_t CodeGenerator::GetArrayLengthOffset(HArrayLength* array_length) { |