summaryrefslogtreecommitdiff
path: root/deps/v8/src/arm/builtins-arm.cc
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2010-08-13 07:43:53 -0700
committerRyan Dahl <ry@tinyclouds.org>2010-08-13 07:43:53 -0700
commit4bbab1434635ada79b5a82a06872a15870213a52 (patch)
tree16031868188935d0e996fb83d64ae0dd82a38297 /deps/v8/src/arm/builtins-arm.cc
parent0e8d858aba114c77b3fce96d052e2df162597ff2 (diff)
downloadnode-new-4bbab1434635ada79b5a82a06872a15870213a52.tar.gz
Revert "Upgrade V8 to 2.3.7"
This reverts commit 083ee0f8b7a8d98d51bf2debf47d68117f13087f. V8 build broken on cygwin: ./deps/v8/src/handles.h:62: instantiated from `T* v8::internal::Handle<T>::operator->() const [with T = v8::internal::Code]' ./deps/v8/src/accessors.cc:396: instantiated from here ./deps/v8/src/handles-inl.h:50: error: call of overloaded `BitCast(v8::internal::Code** const&)' is ambiguous ./deps/v8/src/utils.h:732: note: candidates are: Dest v8::internal::BitCast(const Source&) [with Dest = v8::internal::Code**, Source = v8::internal::Code**] ./deps/v8/src/utils.h:743: note: Dest v8::internal::BitCast(Source* const&) [with Dest = v8::internal::Code**, Source = v8::internal::Code*] scons: *** [obj/release/accessors.o] Error 1
Diffstat (limited to 'deps/v8/src/arm/builtins-arm.cc')
-rw-r--r--deps/v8/src/arm/builtins-arm.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/v8/src/arm/builtins-arm.cc b/deps/v8/src/arm/builtins-arm.cc
index 37768e8d5f..b1f29ba381 100644
--- a/deps/v8/src/arm/builtins-arm.cc
+++ b/deps/v8/src/arm/builtins-arm.cc
@@ -1050,7 +1050,7 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
__ ldr(r2,
FieldMemOperand(r3, SharedFunctionInfo::kFormalParameterCountOffset));
__ mov(r2, Operand(r2, ASR, kSmiTagSize));
- __ ldr(r3, FieldMemOperand(r1, JSFunction::kCodeOffset));
+ __ ldr(r3, FieldMemOperand(r3, SharedFunctionInfo::kCodeOffset));
__ add(r3, r3, Operand(Code::kHeaderSize - kHeapObjectTag));
__ cmp(r2, r0); // Check formal and actual parameter counts.
__ Jump(Handle<Code>(builtin(ArgumentsAdaptorTrampoline)),