Reviewers: Jakob,
Description:
Merged r15898 into trunk branch.
Revert "Check that ExternalString objects get aligned resources" (r15894).
[email protected]
Please review this at https://codereview.chromium.org/20560006/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
src/api.cc
src/version.cc
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index
91174d69e9c2605af189d2986605022765cffe4f..5978ed270e34d51d8a5de093310ba023d0810a55
100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -779,8 +779,8 @@ static void* DecodeSmiToAligned(i::Object* value, const
char* location) {
}
-static i::Smi* EncodeAlignedAsSmi(const void* value, const char* location)
{
- i::Smi* smi = const_cast<i::Smi*>(reinterpret_cast<const
i::Smi*>(value));
+static i::Smi* EncodeAlignedAsSmi(void* value, const char* location) {
+ i::Smi* smi = reinterpret_cast<i::Smi*>(value);
ApiCheck(smi->IsSmi(), location, "Pointer is not aligned");
return smi;
}
@@ -5937,10 +5937,6 @@ Local<String> v8::String::NewExternal(
LOG_API(isolate, "String::NewExternal");
ENTER_V8(isolate);
CHECK(resource && resource->data());
- // Resource pointers need to look like Smis since ExternalString objects
- // are sometimes put into old pointer space (see
i::String::MakeExternal).
- CHECK(EncodeAlignedAsSmi(resource, "v8::String::NewExternal()"));
- CHECK(EncodeAlignedAsSmi(resource->data(), "v8::String::NewExternal()"));
i::Handle<i::String> result = NewExternalStringHandle(isolate, resource);
isolate->heap()->external_string_table()->AddString(*result);
return Utils::ToLocal(result);
@@ -5962,10 +5958,6 @@ bool
v8::String::MakeExternal(v8::String::ExternalStringResource* resource) {
return false;
}
CHECK(resource && resource->data());
- // Resource pointers need to look like Smis since ExternalString objects
- // are sometimes put into old pointer space (see
i::String::MakeExternal).
- CHECK(EncodeAlignedAsSmi(resource, "v8::String::MakeExternal()"));
-
CHECK(EncodeAlignedAsSmi(resource->data(), "v8::String::MakeExternal()"));
bool result = obj->MakeExternal(resource);
if (result && !obj->IsInternalizedString()) {
isolate->heap()->external_string_table()->AddString(*obj);
@@ -5981,10 +5973,6 @@ Local<String> v8::String::NewExternal(
LOG_API(isolate, "String::NewExternal");
ENTER_V8(isolate);
CHECK(resource && resource->data());
- // Resource pointers need to look like Smis since ExternalString objects
- // are sometimes put into old pointer space (see
i::String::MakeExternal).
- CHECK(EncodeAlignedAsSmi(resource, "v8::String::NewExternal()"));
- CHECK(EncodeAlignedAsSmi(resource->data(), "v8::String::NewExternal()"));
i::Handle<i::String> result = NewExternalAsciiStringHandle(isolate,
resource);
isolate->heap()->external_string_table()->AddString(*result);
return Utils::ToLocal(result);
@@ -6007,10 +5995,6 @@ bool v8::String::MakeExternal(
return false;
}
CHECK(resource && resource->data());
- // Resource pointers need to look like Smis since ExternalString objects
- // are sometimes put into old pointer space (see
i::String::MakeExternal).
- CHECK(EncodeAlignedAsSmi(resource, "v8::String::MakeExternal()"));
-
CHECK(EncodeAlignedAsSmi(resource->data(), "v8::String::MakeExternal()"));
bool result = obj->MakeExternal(resource);
if (result && !obj->IsInternalizedString()) {
isolate->heap()->external_string_table()->AddString(*obj);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
bae1a70f8bd5825aca26d23722c01d3db4f5a6d3..ffd39937999749b18d4b57ff83a1098e2ab2c5e7
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 20
#define BUILD_NUMBER 9
-#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
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
