Skip to content

Commit 069c0df

Browse files
committed
deps: upgrade v8 to 4.1.0.12
No out-of-tree patches, yay! PR-URL: #555 Reviewed-By: Fedor Indutny <[email protected]>
1 parent ada2a43 commit 069c0df

7 files changed

+12
-10
lines changed

deps/v8/src/accessors.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,9 @@ void Accessors::RegExpSourceGetter(
382382
i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
383383
HandleScope scope(isolate);
384384

385-
Handle<Object> receiver =
386-
Utils::OpenHandle(*v8::Local<v8::Value>(info.This()));
387-
Handle<JSRegExp> regexp = Handle<JSRegExp>::cast(receiver);
385+
Handle<Object> holder =
386+
Utils::OpenHandle(*v8::Local<v8::Value>(info.Holder()));
387+
Handle<JSRegExp> regexp = Handle<JSRegExp>::cast(holder);
388388
Handle<String> result;
389389
if (regexp->TypeTag() == JSRegExp::NOT_COMPILED) {
390390
result = isolate->factory()->empty_string();

deps/v8/src/base/atomicops_internals_mips64_gcc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
5959
"2:\n"
6060
".set pop\n"
6161
: "=&r" (prev), "=m" (*ptr), "=&r" (tmp)
62-
: "Ir" (old_value), "r" (new_value), "m" (*ptr)
62+
: "r" (old_value), "r" (new_value), "m" (*ptr)
6363
: "memory");
6464
return prev;
6565
}
@@ -196,7 +196,7 @@ inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
196196
"2:\n"
197197
".set pop\n"
198198
: "=&r" (prev), "=m" (*ptr), "=&r" (tmp)
199-
: "Ir" (old_value), "r" (new_value), "m" (*ptr)
199+
: "r" (old_value), "r" (new_value), "m" (*ptr)
200200
: "memory");
201201
return prev;
202202
}

deps/v8/src/base/atomicops_internals_mips_gcc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
3636
"2:\n"
3737
".set pop\n"
3838
: "=&r" (prev), "=&r" (tmp)
39-
: "Ir" (old_value), "r" (new_value), "r" (ptr)
39+
: "r" (old_value), "r" (new_value), "r" (ptr)
4040
: "memory");
4141
return prev;
4242
}

deps/v8/src/ic/mips/ic-compiler-mips.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types,
6262
// Separate compare from branch, to provide path for above JumpIfSmi().
6363
Handle<WeakCell> cell = Map::WeakCellForMap(map);
6464
__ GetWeakValue(match, cell);
65+
__ Subu(match, match, Operand(map_reg));
6566
if (type->Is(HeapType::Number())) {
6667
DCHECK(!number_case.is_unused());
6768
__ bind(&number_case);
6869
}
6970
__ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match,
70-
Operand(map_reg));
71+
Operand(zero_reg));
7172
}
7273
}
7374
DCHECK(number_of_handled_maps != 0);

deps/v8/src/ic/mips64/ic-compiler-mips64.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types,
6262
// Separate compare from branch, to provide path for above JumpIfSmi().
6363
Handle<WeakCell> cell = Map::WeakCellForMap(map);
6464
__ GetWeakValue(match, cell);
65+
__ Dsubu(match, match, Operand(map_reg));
6566
if (type->Is(HeapType::Number())) {
6667
DCHECK(!number_case.is_unused());
6768
__ bind(&number_case);
6869
}
6970
__ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match,
70-
Operand(map_reg));
71+
Operand(zero_reg));
7172
}
7273
}
7374
DCHECK(number_of_handled_maps != 0);

deps/v8/src/preparser.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2905,7 +2905,7 @@ ParserBase<Traits>::ParseTemplateLiteral(ExpressionT tag, int start, bool* ok) {
29052905
Next();
29062906

29072907
if (next == Token::EOS) {
2908-
ReportMessageAt(Scanner::Location(start, peek_position()),
2908+
ReportMessageAt(Scanner::Location(start, position()),
29092909
"unterminated_template");
29102910
*ok = false;
29112911
return Traits::EmptyExpression();

deps/v8/src/version.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define MAJOR_VERSION 4
3636
#define MINOR_VERSION 1
3737
#define BUILD_NUMBER 0
38-
#define PATCH_LEVEL 7
38+
#define PATCH_LEVEL 12
3939
// Use 1 for candidates and 0 otherwise.
4040
// (Boolean macro values are not supported by all preprocessors.)
4141
#define IS_CANDIDATE_VERSION 0

0 commit comments

Comments
 (0)