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

Side by Side Diff: src/code-stubs.cc

Issue 22870002: Merged r16012, r16014, r16037, r16042, r16082, r16085, r16101, r16102, r16106 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: Created 7 years, 4 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/api.cc ('k') | src/global-handles.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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 state_.Add(GENERIC); 550 state_.Add(GENERIC);
551 } else { 551 } else {
552 state_.Add(MONOMORPHIC_MAP); 552 state_.Add(MONOMORPHIC_MAP);
553 } 553 }
554 TraceTransition(old_state, state_); 554 TraceTransition(old_state, state_);
555 } 555 }
556 556
557 557
558 template<class StateType> 558 template<class StateType>
559 void HydrogenCodeStub::TraceTransition(StateType from, StateType to) { 559 void HydrogenCodeStub::TraceTransition(StateType from, StateType to) {
560 // Note: Although a no-op transition is semantically OK, it is hinting at a
561 // bug somewhere in our state transition machinery.
562 ASSERT(from != to);
560 #ifdef DEBUG 563 #ifdef DEBUG
561 if (!FLAG_trace_ic) return; 564 if (!FLAG_trace_ic) return;
562 char buffer[100]; 565 char buffer[100];
563 NoAllocationStringAllocator allocator(buffer, 566 NoAllocationStringAllocator allocator(buffer,
564 static_cast<unsigned>(sizeof(buffer))); 567 static_cast<unsigned>(sizeof(buffer)));
565 StringStream stream(&allocator); 568 StringStream stream(&allocator);
566 stream.Add("["); 569 stream.Add("[");
567 PrintBaseName(&stream); 570 PrintBaseName(&stream);
568 stream.Add(": "); 571 stream.Add(": ");
569 from.Print(&stream); 572 from.Print(&stream);
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 InstallDescriptor(isolate, &stub3); 887 InstallDescriptor(isolate, &stub3);
885 } 888 }
886 889
887 InternalArrayConstructorStub::InternalArrayConstructorStub( 890 InternalArrayConstructorStub::InternalArrayConstructorStub(
888 Isolate* isolate) { 891 Isolate* isolate) {
889 InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(isolate); 892 InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(isolate);
890 } 893 }
891 894
892 895
893 } } // namespace v8::internal 896 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/api.cc ('k') | src/global-handles.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698