Revision: 11316
Author: [email protected]
Date: Fri Apr 13 06:01:33 2012
Log: Merged r11308, r11311, r11313 into trunk branch.
Fix several ancient presubmit failures.
Provide empty default implementation of OutputStream::WriteUint32Chunk to
make Webkit V8 bindings compile
Fix r11306 to use external references on X64.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10081005
http://code.google.com/p/v8/source/detail?r=11316
Modified:
/trunk/include/v8.h
/trunk/src/arguments.h
/trunk/src/version.cc
/trunk/src/x64/stub-cache-x64.cc
=======================================
--- /trunk/include/v8.h Fri Apr 13 02:58:30 2012
+++ /trunk/include/v8.h Fri Apr 13 06:01:33 2012
@@ -1969,6 +1969,7 @@
inline bool IsConstructCall() const;
inline Local<Value> Data() const;
inline Isolate* GetIsolate() const;
+
private:
static const int kIsolateIndex = 0;
static const int kDataIndex = -1;
@@ -1999,6 +2000,7 @@
inline Local<Value> Data() const;
inline Local<Object> This() const;
inline Local<Object> Holder() const;
+
private:
internal::Object** args_;
};
@@ -3770,7 +3772,11 @@
* can be stopped by returning kAbort as function result. EndOfStream
* will not be called in case writing was aborted.
*/
- virtual WriteResult WriteUint32Chunk(uint32_t* data, int count) = 0;
+ // TODO(loislo): Make this pure virtual when WebKit's V8 bindings
+ // have been updated.
+ virtual WriteResult WriteUint32Chunk(uint32_t* data, int count) {
+ return kAbort;
+ };
};
=======================================
--- /trunk/src/arguments.h Fri Apr 13 02:58:30 2012
+++ /trunk/src/arguments.h Fri Apr 13 06:01:33 2012
@@ -108,6 +108,7 @@
void IterateInstance(ObjectVisitor* v);
Object** end() { return values_ + ARRAY_SIZE(values_) - 1; }
+
private:
Object* values_[4];
};
=======================================
--- /trunk/src/version.cc Fri Apr 13 02:58:30 2012
+++ /trunk/src/version.cc Fri Apr 13 06:01:33 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 10
#define BUILD_NUMBER 2
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /trunk/src/x64/stub-cache-x64.cc Fri Apr 13 02:58:30 2012
+++ /trunk/src/x64/stub-cache-x64.cc Fri Apr 13 06:01:33 2012
@@ -379,7 +379,8 @@
__ push(receiver);
__ push(holder);
__ push(FieldOperand(kScratchRegister, InterceptorInfo::kDataOffset));
- __ push(Immediate(reinterpret_cast<intptr_t>(masm->isolate())));
+ __ movq(kScratchRegister, ExternalReference::isolate_address());
+ __ push(kScratchRegister);
}
@@ -475,8 +476,8 @@
} else {
__ Move(Operand(rsp, 3 * kPointerSize), call_data);
}
- __ movq(Operand(rsp, 4 * kPointerSize),
- Immediate(reinterpret_cast<intptr_t>(masm->isolate())));
+ __ movq(kScratchRegister, ExternalReference::isolate_address());
+ __ movq(Operand(rsp, 4 * kPointerSize), kScratchRegister);
// Prepare arguments.
__ lea(rbx, Operand(rsp, 4 * kPointerSize));
@@ -1009,7 +1010,8 @@
} else {
__ Push(Handle<Object>(callback->data()));
}
- __ push(Immediate(reinterpret_cast<intptr_t>(isolate()))); // isolate
+ __ movq(kScratchRegister, ExternalReference::isolate_address());
+ __ push(kScratchRegister); // isolate
__ push(name_reg); // name
// Save a pointer to where we pushed the arguments pointer.
// This will be passed as the const AccessorInfo& to the C++ callback.
@@ -1184,7 +1186,8 @@
__ push(holder_reg);
__ Move(holder_reg, callback);
__ push(FieldOperand(holder_reg, AccessorInfo::kDataOffset));
- __ push(Immediate(reinterpret_cast<intptr_t>(isolate())));
+ __ movq(kScratchRegister, ExternalReference::isolate_address());
+ __ push(kScratchRegister);
__ push(holder_reg);
__ push(name_reg);
__ push(scratch2); // restore return address
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
