| Index: src/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
|
| index 41441f5efe422c5d738459e05e487b16512f584b..1838ca984253f91ea686687693a4e73eeb86274f 100644
|
| --- a/src/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/ia32/lithium-codegen-ia32.cc
|
| @@ -113,7 +113,7 @@ void LCodeGen::FinishCode(Handle<Code> code) {
|
| }
|
|
|
|
|
| -void LCodeGen::Abort(const char* reason) {
|
| +void LCodeGen::Abort(BailoutReason reason) {
|
| info()->set_bailout_reason(reason);
|
| status_ = ABORTED;
|
| }
|
| @@ -210,7 +210,7 @@ bool LCodeGen::GeneratePrologue() {
|
| dynamic_frame_alignment_ &&
|
| FLAG_debug_code) {
|
| __ test(esp, Immediate(kPointerSize));
|
| - __ Assert(zero, "frame is expected to be aligned");
|
| + __ Assert(zero, kFrameIsExpectedToBeAligned);
|
| }
|
|
|
| // Reserve space for the stack slots needed by the code.
|
| @@ -943,7 +943,7 @@ void LCodeGen::DeoptimizeIf(Condition cc,
|
| Address entry =
|
| Deoptimizer::GetDeoptimizationEntry(isolate(), id, bailout_type);
|
| if (entry == NULL) {
|
| - Abort("bailout was not prepared");
|
| + Abort(kBailoutWasNotPrepared);
|
| return;
|
| }
|
|
|
| @@ -1971,7 +1971,7 @@ void LCodeGen::DoSeqStringSetChar(LSeqStringSetChar* instr) {
|
| static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
| __ cmp(value, Immediate(encoding == String::ONE_BYTE_ENCODING
|
| ? one_byte_seq_type : two_byte_seq_type));
|
| - __ Check(equal, "Unexpected string type");
|
| + __ Check(equal, kUnexpectedStringType);
|
| __ pop(value);
|
| }
|
|
|
| @@ -2858,7 +2858,7 @@ void LCodeGen::EmitReturn(LReturn* instr, bool dynamic_frame_alignment) {
|
| __ cmp(Operand(esp,
|
| (parameter_count + extra_value_count) * kPointerSize),
|
| Immediate(kAlignmentZapValue));
|
| - __ Assert(equal, "expected alignment marker");
|
| + __ Assert(equal, kExpectedAlignmentMarker);
|
| }
|
| __ Ret((parameter_count + extra_value_count) * kPointerSize, ecx);
|
| } else {
|
| @@ -2871,7 +2871,7 @@ void LCodeGen::EmitReturn(LReturn* instr, bool dynamic_frame_alignment) {
|
| __ cmp(Operand(esp, reg, times_pointer_size,
|
| extra_value_count * kPointerSize),
|
| Immediate(kAlignmentZapValue));
|
| - __ Assert(equal, "expected alignment marker");
|
| + __ Assert(equal, kExpectedAlignmentMarker);
|
| }
|
|
|
| // emit code to restore stack based on instr->parameter_count()
|
| @@ -3442,7 +3442,7 @@ Operand LCodeGen::BuildFastArrayOperand(
|
| if (key->IsConstantOperand()) {
|
| int constant_value = ToInteger32(LConstantOperand::cast(key));
|
| if (constant_value & 0xF0000000) {
|
| - Abort("array index constant value too big");
|
| + Abort(kArrayIndexConstantValueTooBig);
|
| }
|
| return Operand(elements_pointer_reg,
|
| ((constant_value + additional_index) << shift_size)
|
|
|