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

Side by Side Diff: src/type-info.cc

Issue 6852015: Support string add in crankshaft: (Closed)
Patch Set: Review fixes and ports Created 9 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
« no previous file with comments | « src/ic.cc ('k') | src/x64/code-stubs-x64.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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 return unknown; 268 return unknown;
269 } 269 }
270 case TRBinaryOpIC::INT32: 270 case TRBinaryOpIC::INT32:
271 if (expr->op() == Token::DIV || 271 if (expr->op() == Token::DIV ||
272 result_type == TRBinaryOpIC::HEAP_NUMBER) { 272 result_type == TRBinaryOpIC::HEAP_NUMBER) {
273 return TypeInfo::Double(); 273 return TypeInfo::Double();
274 } 274 }
275 return TypeInfo::Integer32(); 275 return TypeInfo::Integer32();
276 case TRBinaryOpIC::HEAP_NUMBER: 276 case TRBinaryOpIC::HEAP_NUMBER:
277 return TypeInfo::Double(); 277 return TypeInfo::Double();
278 case TRBinaryOpIC::BOTH_STRING:
279 return TypeInfo::String();
278 case TRBinaryOpIC::STRING: 280 case TRBinaryOpIC::STRING:
279 case TRBinaryOpIC::GENERIC: 281 case TRBinaryOpIC::GENERIC:
280 return unknown; 282 return unknown;
281 default: 283 default:
282 return unknown; 284 return unknown;
283 } 285 }
284 } 286 }
285 return unknown; 287 return unknown;
286 } 288 }
287 289
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 source_positions->Add(position); 447 source_positions->Add(position);
446 } 448 }
447 } else { 449 } else {
448 ASSERT(RelocInfo::IsPosition(mode)); 450 ASSERT(RelocInfo::IsPosition(mode));
449 position = static_cast<int>(info->data()); 451 position = static_cast<int>(info->data());
450 } 452 }
451 } 453 }
452 } 454 }
453 455
454 } } // namespace v8::internal 456 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/ic.cc ('k') | src/x64/code-stubs-x64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698