Author: [email protected]
Date: Fri Apr 17 03:24:24 2009
New Revision: 1735
Modified:
trunk/src/api.cc
trunk/src/mark-compact.cc
trunk/src/objects-inl.h
trunk/src/objects.cc
trunk/src/runtime.cc
Log:
Push bleeding_edge revision 1734 to trunk.
Modified: trunk/src/api.cc
==============================================================================
--- trunk/src/api.cc (original)
+++ trunk/src/api.cc Fri Apr 17 03:24:24 2009
@@ -2373,7 +2373,7 @@
const char* v8::V8::GetVersion() {
- return "1.1.10.1";
+ return "1.1.10.2";
}
Modified: trunk/src/mark-compact.cc
==============================================================================
--- trunk/src/mark-compact.cc (original)
+++ trunk/src/mark-compact.cc Fri Apr 17 03:24:24 2009
@@ -404,15 +404,19 @@
ExternalString::kResourceOffset -
kHeapObjectTag;
if (is_two_byte) {
- v8::String::ExternalStringResource* resource =
- *reinterpret_cast<v8::String::ExternalStringResource**>
+ v8::String::ExternalStringResource** resource =
+ reinterpret_cast<v8::String::ExternalStringResource**>
(resource_addr);
- delete resource;
+ delete *resource;
+ // Clear the resource pointer in the symbol.
+ *resource = NULL;
} else {
- v8::String::ExternalAsciiStringResource* resource =
-
*reinterpret_cast<v8::String::ExternalAsciiStringResource**>
+ v8::String::ExternalAsciiStringResource** resource =
+ reinterpret_cast<v8::String::ExternalAsciiStringResource**>
(resource_addr);
- delete resource;
+ delete *resource;
+ // Clear the resource pointer in the symbol.
+ *resource = NULL;
}
}
// Set the entry to null_value (as deleted).
Modified: trunk/src/objects-inl.h
==============================================================================
--- trunk/src/objects-inl.h (original)
+++ trunk/src/objects-inl.h Fri Apr 17 03:24:24 2009
@@ -263,8 +263,7 @@
bool StringShape::IsSequentialTwoByte() {
- return (type_ & (kStringRepresentationMask | kStringEncodingMask)) ==
- (kSeqStringTag | kTwoByteStringTag);
+ return full_representation_tag() == (kSeqStringTag | kTwoByteStringTag);
}
@@ -274,8 +273,7 @@
bool StringShape::IsExternalTwoByte() {
- return (type_ & (kStringRepresentationMask | kStringEncodingMask)) ==
- (kExternalStringTag | kTwoByteStringTag);
+ return full_representation_tag() == (kExternalStringTag |
kTwoByteStringTag);
}
Modified: trunk/src/objects.cc
==============================================================================
--- trunk/src/objects.cc (original)
+++ trunk/src/objects.cc Fri Apr 17 03:24:24 2009
@@ -3609,7 +3609,7 @@
while (chars_read < max_chars) {
uint16_t c = data[offset];
if (c <= kMaxAsciiCharCode) {
- // Fast case for ASCII characters. Cursor is an input output
argument.
+ // Fast case for ASCII characters. Cursor is an input output
argument.
if (!unibrow::CharacterStream::EncodeAsciiCharacter(c,
rbb->util_buffer,
rbb->capacity,
Modified: trunk/src/runtime.cc
==============================================================================
--- trunk/src/runtime.cc (original)
+++ trunk/src/runtime.cc Fri Apr 17 03:24:24 2009
@@ -6524,9 +6524,9 @@
return true;
}
if (StringShape(String::cast(str)).IsAsciiRepresentation()) {
- return ExternalAsciiString::cast(str)->resource() != 0;
+ return ExternalAsciiString::cast(str)->resource() != NULL;
} else if (StringShape(String::cast(str)).IsTwoByteRepresentation()) {
- return ExternalTwoByteString::cast(str)->resource() != 0;
+ return ExternalTwoByteString::cast(str)->resource() != NULL;
} else {
return true;
}
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
