Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: src/objects-inl.h

Issue 14298021: remove IsOneByteConvertible (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/objects.h ('k') | src/runtime.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 case kTwoByteStringTag: 350 case kTwoByteStringTag:
351 return true; 351 return true;
352 default: // Cons or sliced string. Need to go deeper. 352 default: // Cons or sliced string. Need to go deeper.
353 return GetUnderlying()->IsTwoByteRepresentation(); 353 return GetUnderlying()->IsTwoByteRepresentation();
354 } 354 }
355 } 355 }
356 356
357 357
358 bool String::HasOnlyOneByteChars() { 358 bool String::HasOnlyOneByteChars() {
359 uint32_t type = map()->instance_type(); 359 uint32_t type = map()->instance_type();
360 return (type & kOneByteDataHintMask) == kOneByteDataHintTag; 360 return (type & kOneByteDataHintMask) == kOneByteDataHintTag ||
361 IsOneByteRepresentation();
361 } 362 }
362 363
363 364
364 bool String::IsOneByteConvertible() {
365 return HasOnlyOneByteChars() || IsOneByteRepresentation();
366 }
367
368
369 bool StringShape::IsCons() { 365 bool StringShape::IsCons() {
370 return (type_ & kStringRepresentationMask) == kConsStringTag; 366 return (type_ & kStringRepresentationMask) == kConsStringTag;
371 } 367 }
372 368
373 369
374 bool StringShape::IsSliced() { 370 bool StringShape::IsSliced() {
375 return (type_ & kStringRepresentationMask) == kSlicedStringTag; 371 return (type_ & kStringRepresentationMask) == kSlicedStringTag;
376 } 372 }
377 373
378 374
(...skipping 5805 matching lines...) Expand 10 before | Expand all | Expand 10 after
6184 #undef WRITE_UINT32_FIELD 6180 #undef WRITE_UINT32_FIELD
6185 #undef READ_SHORT_FIELD 6181 #undef READ_SHORT_FIELD
6186 #undef WRITE_SHORT_FIELD 6182 #undef WRITE_SHORT_FIELD
6187 #undef READ_BYTE_FIELD 6183 #undef READ_BYTE_FIELD
6188 #undef WRITE_BYTE_FIELD 6184 #undef WRITE_BYTE_FIELD
6189 6185
6190 6186
6191 } } // namespace v8::internal 6187 } } // namespace v8::internal
6192 6188
6193 #endif // V8_OBJECTS_INL_H_ 6189 #endif // V8_OBJECTS_INL_H_
OLDNEW
« no previous file with comments | « src/objects.h ('k') | src/runtime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698