Browse Source

Merge branch 'v8-3.1' into v0.4

v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
8d88c00b77
  1. 8
      deps/v8/src/arm/code-stubs-arm.cc
  2. 4
      deps/v8/src/builtins.cc
  3. 2
      deps/v8/src/runtime.cc
  4. 2
      deps/v8/src/version.cc

8
deps/v8/src/arm/code-stubs-arm.cc

@ -3425,6 +3425,8 @@ void TypeRecordingBinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {
// Save the left value on the stack.
__ Push(r5, r4);
Label pop_and_call_runtime;
// Allocate a heap number to store the result.
heap_number_result = r5;
GenerateHeapResultAllocation(masm,
@ -3432,7 +3434,7 @@ void TypeRecordingBinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {
heap_number_map,
scratch1,
scratch2,
&call_runtime);
&pop_and_call_runtime);
// Load the left value from the value saved on the stack.
__ Pop(r1, r0);
@ -3440,6 +3442,10 @@ void TypeRecordingBinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {
// Call the C function to handle the double operation.
FloatingPointHelper::CallCCodeForDoubleOperation(
masm, op_, heap_number_result, scratch1);
__ bind(&pop_and_call_runtime);
__ Drop(2);
__ b(&call_runtime);
}
break;

4
deps/v8/src/builtins.cc

@ -818,8 +818,8 @@ BUILTIN(ArraySplice) {
const int delta = actual_delete_count - item_count;
if (actual_start > 0) {
Object** start = elms->data_start();
memmove(start + delta, start, actual_start * kPointerSize);
AssertNoAllocation no_gc;
MoveElements(&no_gc, elms, delta, elms, 0, actual_start);
}
elms = LeftTrimFixedArray(elms, delta);

2
deps/v8/src/runtime.cc

@ -2625,7 +2625,7 @@ MUST_USE_RESULT static MaybeObject* StringReplaceRegExpWithEmptyString(
end = RegExpImpl::GetCapture(match_info_array, 1);
}
int length = subject->length();
int length = subject_handle->length();
int new_length = length - (end - start);
if (new_length == 0) {
return Heap::empty_string();

2
deps/v8/src/version.cc

@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 1
#define BUILD_NUMBER 8
#define PATCH_LEVEL 10
#define PATCH_LEVEL 14
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the

Loading…
Cancel
Save