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

Side by Side Diff: src/objects-visiting.cc

Issue 7860035: Merge bleeding edge up to 9192 into the GC branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Created 9 years, 3 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-visiting.h ('k') | src/objects-visiting-inl.h » ('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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 return kVisitSeqTwoByteString; 51 return kVisitSeqTwoByteString;
52 } 52 }
53 53
54 case kConsStringTag: 54 case kConsStringTag:
55 if (IsShortcutCandidate(instance_type)) { 55 if (IsShortcutCandidate(instance_type)) {
56 return kVisitShortcutCandidate; 56 return kVisitShortcutCandidate;
57 } else { 57 } else {
58 return kVisitConsString; 58 return kVisitConsString;
59 } 59 }
60 60
61 case kSlicedStringTag:
62 return kVisitSlicedString;
63
61 case kExternalStringTag: 64 case kExternalStringTag:
62 return GetVisitorIdForSize(kVisitDataObject, 65 return GetVisitorIdForSize(kVisitDataObject,
63 kVisitDataObjectGeneric, 66 kVisitDataObjectGeneric,
64 ExternalString::kSize); 67 ExternalString::kSize);
65 } 68 }
66 UNREACHABLE(); 69 UNREACHABLE();
67 } 70 }
68 71
69 switch (instance_type) { 72 switch (instance_type) {
70 case BYTE_ARRAY_TYPE: 73 case BYTE_ARRAY_TYPE:
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 kVisitStructGeneric, 153 kVisitStructGeneric,
151 instance_size); 154 instance_size);
152 155
153 default: 156 default:
154 UNREACHABLE(); 157 UNREACHABLE();
155 return kVisitorIdCount; 158 return kVisitorIdCount;
156 } 159 }
157 } 160 }
158 161
159 } } // namespace v8::internal 162 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/objects-visiting.h ('k') | src/objects-visiting-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698