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

Side by Side Diff: src/objects.h

Issue 169113005: Revert "Handlify DescriptorArray::Merge()." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 10 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 | « no previous file | src/objects.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 3370 matching lines...) Expand 10 before | Expand all | Expand 10 after
3381 void CopyFrom(int dst_index, 3381 void CopyFrom(int dst_index,
3382 DescriptorArray* src, 3382 DescriptorArray* src,
3383 int src_index, 3383 int src_index,
3384 const WhitenessWitness&); 3384 const WhitenessWitness&);
3385 static Handle<DescriptorArray> Merge(Handle<DescriptorArray> desc, 3385 static Handle<DescriptorArray> Merge(Handle<DescriptorArray> desc,
3386 int verbatim, 3386 int verbatim,
3387 int valid, 3387 int valid,
3388 int new_size, 3388 int new_size,
3389 int modify_index, 3389 int modify_index,
3390 StoreMode store_mode, 3390 StoreMode store_mode,
3391 Handle<DescriptorArray> other) 3391 Handle<DescriptorArray> other);
3392 V8_WARN_UNUSED_RESULT; 3392 MUST_USE_RESULT MaybeObject* Merge(int verbatim,
3393 int valid,
3394 int new_size,
3395 int modify_index,
3396 StoreMode store_mode,
3397 DescriptorArray* other);
3393 3398
3394 bool IsMoreGeneralThan(int verbatim, 3399 bool IsMoreGeneralThan(int verbatim,
3395 int valid, 3400 int valid,
3396 int new_size, 3401 int new_size,
3397 DescriptorArray* other); 3402 DescriptorArray* other);
3398 3403
3399 MUST_USE_RESULT MaybeObject* CopyUpTo(int enumeration_index) { 3404 MUST_USE_RESULT MaybeObject* CopyUpTo(int enumeration_index) {
3400 return CopyUpToAddAttributes(enumeration_index, NONE); 3405 return CopyUpToAddAttributes(enumeration_index, NONE);
3401 } 3406 }
3402 3407
(...skipping 7359 matching lines...) Expand 10 before | Expand all | Expand 10 after
10762 } else { 10767 } else {
10763 value &= ~(1 << bit_position); 10768 value &= ~(1 << bit_position);
10764 } 10769 }
10765 return value; 10770 return value;
10766 } 10771 }
10767 }; 10772 };
10768 10773
10769 } } // namespace v8::internal 10774 } } // namespace v8::internal
10770 10775
10771 #endif // V8_OBJECTS_H_ 10776 #endif // V8_OBJECTS_H_
OLDNEW
« no previous file with comments | « no previous file | src/objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698