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

Side by Side Diff: src/objects.cc

Issue 23542029: Simplify installing concurrently recompiled code. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: add stack check when calling function that is in recompile queue. Created 7 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
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 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 9336 matching lines...) Expand 10 before | Expand all | Expand 10 after
9347 PrintF(" ** Marking "); 9347 PrintF(" ** Marking ");
9348 PrintName(); 9348 PrintName();
9349 PrintF(" for concurrent recompilation.\n"); 9349 PrintF(" for concurrent recompilation.\n");
9350 } 9350 }
9351 set_code_no_write_barrier( 9351 set_code_no_write_barrier(
9352 GetIsolate()->builtins()->builtin(Builtins::kConcurrentRecompile)); 9352 GetIsolate()->builtins()->builtin(Builtins::kConcurrentRecompile));
9353 // No write barrier required, since the builtin is part of the root set. 9353 // No write barrier required, since the builtin is part of the root set.
9354 } 9354 }
9355 9355
9356 9356
9357 void JSFunction::MarkForInstallingRecompiledCode() {
9358 // The debugger could have switched the builtin to lazy compile.
9359 // In that case, simply carry on. It will be dealt with later.
9360 ASSERT(!IsOptimized());
9361 ASSERT(shared()->allows_lazy_compilation() || code()->optimizable());
9362 ASSERT(FLAG_concurrent_recompilation);
9363 set_code_no_write_barrier(
9364 GetIsolate()->builtins()->builtin(Builtins::kInstallRecompiledCode));
9365 // No write barrier required, since the builtin is part of the root set.
9366 }
9367
9368
9369 void JSFunction::MarkInRecompileQueue() { 9357 void JSFunction::MarkInRecompileQueue() {
9370 // We can only arrive here via the concurrent-recompilation builtin. If 9358 // We can only arrive here via the concurrent-recompilation builtin. If
9371 // break points were set, the code would point to the lazy-compile builtin. 9359 // break points were set, the code would point to the lazy-compile builtin.
9372 ASSERT(!GetIsolate()->DebuggerHasBreakPoints()); 9360 ASSERT(!GetIsolate()->DebuggerHasBreakPoints());
9373 ASSERT(IsMarkedForConcurrentRecompilation() && !IsOptimized()); 9361 ASSERT(IsMarkedForConcurrentRecompilation() && !IsOptimized());
9374 ASSERT(shared()->allows_lazy_compilation() || code()->optimizable()); 9362 ASSERT(shared()->allows_lazy_compilation() || code()->optimizable());
9375 ASSERT(FLAG_concurrent_recompilation); 9363 ASSERT(FLAG_concurrent_recompilation);
9376 if (FLAG_trace_concurrent_recompilation) { 9364 if (FLAG_trace_concurrent_recompilation) {
9377 PrintF(" ** Queueing "); 9365 PrintF(" ** Queueing ");
9378 PrintName(); 9366 PrintName();
(...skipping 6742 matching lines...) Expand 10 before | Expand all | Expand 10 after
16121 #define ERROR_MESSAGES_TEXTS(C, T) T, 16109 #define ERROR_MESSAGES_TEXTS(C, T) T,
16122 static const char* error_messages_[] = { 16110 static const char* error_messages_[] = {
16123 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) 16111 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS)
16124 }; 16112 };
16125 #undef ERROR_MESSAGES_TEXTS 16113 #undef ERROR_MESSAGES_TEXTS
16126 return error_messages_[reason]; 16114 return error_messages_[reason];
16127 } 16115 }
16128 16116
16129 16117
16130 } } // namespace v8::internal 16118 } } // namespace v8::internal
OLDNEW
« src/objects.h ('K') | « src/objects.h ('k') | src/objects-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698