Index: src/objects.cc |
=================================================================== |
--- src/objects.cc (revision 1697) |
+++ src/objects.cc (working copy) |
@@ -679,7 +679,7 @@ |
SmartPointer<uc16> smart_chars = this->ToWideCString(); |
ASSERT(memcmp(*smart_chars, |
resource->data(), |
- resource->length()*sizeof(**smart_chars)) == 0); |
+ resource->length() * sizeof(**smart_chars)) == 0); |
} |
#endif // DEBUG |
@@ -6304,7 +6304,7 @@ |
if (StringShape(string_).IsCons()) { |
ConsString* cons_string = ConsString::cast(string_); |
cons_string->TryFlatten(); |
- if (cons_string->second() == Heap::empty_string()) { |
+ if (cons_string->second()->length() == 0) { |
string_ = cons_string->first(); |
} |
} |
@@ -6312,6 +6312,7 @@ |
Map* map = Heap::SymbolMapForString(string_); |
if (map != NULL) { |
string_->set_map(map); |
+ ASSERT(string_->IsSymbol()); |
return string_; |
} |
// Otherwise allocate a new symbol. |