Bug 1229196 - Fix MSVC C4334 "was 64-bit shift intended" warning in js/src/asmjs. r=sunfish

js/src/asmjs/AsmJSSignalHandlers.cpp(594) : warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)

--HG--
extra : rebase_source : 4a290c2473de2b0b01e4e185719bf571909f3ff1
This commit is contained in:
Chris Peterson 2015-11-26 11:14:25 -08:00
parent 46bb7c80dd
commit 2de2960439

View File

@ -591,7 +591,8 @@ ComputeAccessAddress(EMULATOR_CONTEXT* context, const Disassembler::ComplexAddre
uintptr_t index;
StoreValueFromGPReg(SharedMem<void*>::unshared(&index), sizeof(uintptr_t),
AddressOfGPRegisterSlot(context, address.index()));
result += index * (1 << address.scale());
MOZ_ASSERT(address.scale() < 32, "address shift overflow");
result += index * (uintptr_t(1) << address.scale());
}
return reinterpret_cast<uint8_t*>(result);