diff options
| author | 2016-11-30 18:21:22 +0000 | |
|---|---|---|
| committer | 2016-11-30 18:21:22 +0000 | |
| commit | 211fd802903c130ed1c47c18d1b87809d290aa69 (patch) | |
| tree | e049fbad2dd7fbf244d5163e084be339f02fc8d7 /compiler/driver/compiler_driver.cc | |
| parent | 304f2d3a1d090846a7a55a0016efc9fc8eb14078 (diff) | |
| parent | 8a0128a5ca0784f6d2b4ca27907e8967a74bc4c5 (diff) | |
Merge "ART: Add dex::StringIndex"
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index ad75ec4604..42e5db3570 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -842,9 +842,9 @@ static void ResolveConstStrings(Handle<mirror::DexCache> dex_cache, switch (inst->Opcode()) { case Instruction::CONST_STRING: case Instruction::CONST_STRING_JUMBO: { - uint32_t string_index = (inst->Opcode() == Instruction::CONST_STRING) + dex::StringIndex string_index((inst->Opcode() == Instruction::CONST_STRING) ? inst->VRegB_21c() - : inst->VRegB_31c(); + : inst->VRegB_31c()); mirror::String* string = class_linker->ResolveString(dex_file, string_index, dex_cache); CHECK(string != nullptr) << "Could not allocate a string when forcing determinism"; break; |