mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 17:25:36 +00:00
Bug 1121481 - Ternary operator compilation fixed with GCC 4.6.4, r=mrosenberg
This commit is contained in:
parent
5b7c1a3e12
commit
ebbb7a3a7d
@ -5439,9 +5439,12 @@ ConcatInlineString(MacroAssembler &masm, Register lhs, Register rhs, Register ou
|
||||
masm.branchIfRope(rhs, failure);
|
||||
|
||||
// Allocate a JSThinInlineString or JSFatInlineString.
|
||||
size_t maxThinInlineLength = isTwoByte
|
||||
? JSThinInlineString::MAX_LENGTH_TWO_BYTE
|
||||
: JSThinInlineString::MAX_LENGTH_LATIN1;
|
||||
size_t maxThinInlineLength;
|
||||
if (isTwoByte)
|
||||
maxThinInlineLength = JSThinInlineString::MAX_LENGTH_TWO_BYTE;
|
||||
else
|
||||
maxThinInlineLength = JSThinInlineString::MAX_LENGTH_LATIN1;
|
||||
|
||||
Label isFat, allocDone;
|
||||
masm.branch32(Assembler::Above, temp2, Imm32(maxThinInlineLength), &isFat);
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user