mirror of https://github.com/nodejs/node.git
Upgrade V8 to 3.1.8.16
parent
eb57d1b9b1
commit
cee4ce39a9
|
@ -585,6 +585,7 @@ enum CompareResult {
|
|||
|
||||
class StringStream;
|
||||
class ObjectVisitor;
|
||||
class Failure;
|
||||
|
||||
struct ValueInfo : public Malloced {
|
||||
ValueInfo() : type(FIRST_TYPE), ptr(NULL), str(NULL), number(0) { }
|
||||
|
@ -611,6 +612,10 @@ class MaybeObject BASE_EMBEDDED {
|
|||
*obj = reinterpret_cast<Object*>(this);
|
||||
return true;
|
||||
}
|
||||
inline Failure* ToFailureUnchecked() {
|
||||
ASSERT(IsFailure());
|
||||
return reinterpret_cast<Failure*>(this);
|
||||
}
|
||||
inline Object* ToObjectUnchecked() {
|
||||
ASSERT(!IsFailure());
|
||||
return reinterpret_cast<Object*>(this);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright 2006-2008 the V8 project authors. All rights reserved.
|
||||
// Copyright 2011 the V8 project authors. All rights reserved.
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
|
@ -740,6 +740,7 @@ Failure* Top::ReThrow(MaybeObject* exception, MessageLocation* location) {
|
|||
|
||||
// Set the exception being re-thrown.
|
||||
set_pending_exception(exception);
|
||||
if (exception->IsFailure()) return exception->ToFailureUnchecked();
|
||||
return Failure::Exception();
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#define MAJOR_VERSION 3
|
||||
#define MINOR_VERSION 1
|
||||
#define BUILD_NUMBER 8
|
||||
#define PATCH_LEVEL 14
|
||||
#define PATCH_LEVEL 16
|
||||
#define CANDIDATE_VERSION false
|
||||
|
||||
// Define SONAME to have the SCons build the put a specific SONAME into the
|
||||
|
|
|
@ -1379,7 +1379,7 @@ void Assembler::jmp(NearLabel* L) {
|
|||
EnsureSpace ensure_space(this);
|
||||
last_pc_ = pc_;
|
||||
if (L->is_bound()) {
|
||||
const int short_size = sizeof(int8_t);
|
||||
const int short_size = 2;
|
||||
int offs = L->pos() - pc_offset();
|
||||
ASSERT(offs <= 0);
|
||||
ASSERT(is_int8(offs - short_size));
|
||||
|
|
Loading…
Reference in New Issue