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

Side by Side Diff: src/compiler.cc

Issue 292323005: If map was deprecated, abort compilation and allow re-compilation. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 7 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 | no next file » | 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 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "v8.h" 5 #include "v8.h"
6 6
7 #include "compiler.h" 7 #include "compiler.h"
8 8
9 #include "bootstrapper.h" 9 #include "bootstrapper.h"
10 #include "codegen.h" 10 #include "codegen.h"
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 ASSERT(graph_ != NULL); 449 ASSERT(graph_ != NULL);
450 // Deferred handles reference objects that were accessible during 450 // Deferred handles reference objects that were accessible during
451 // graph creation. To make sure that we don't encounter inconsistencies 451 // graph creation. To make sure that we don't encounter inconsistencies
452 // between graph creation and code generation, we disallow accessing 452 // between graph creation and code generation, we disallow accessing
453 // objects through deferred handles during the latter, with exceptions. 453 // objects through deferred handles during the latter, with exceptions.
454 DisallowDeferredHandleDereference no_deferred_handle_deref; 454 DisallowDeferredHandleDereference no_deferred_handle_deref;
455 Handle<Code> optimized_code = chunk_->Codegen(); 455 Handle<Code> optimized_code = chunk_->Codegen();
456 if (optimized_code.is_null()) { 456 if (optimized_code.is_null()) {
457 if (info()->bailout_reason() == kNoReason) { 457 if (info()->bailout_reason() == kNoReason) {
458 info_->set_bailout_reason(kCodeGenerationFailed); 458 info_->set_bailout_reason(kCodeGenerationFailed);
459 } else if (info()->bailout_reason() == kMapBecameDeprecated) {
460 if (FLAG_trace_opt) {
461 PrintF("[aborted optimizing ");
462 function->ShortPrint();
463 PrintF(" because a map became deprecated]\n");
464 }
465 return AbortOptimization();
459 } else if (info()->bailout_reason() == kMapBecameUnstable) { 466 } else if (info()->bailout_reason() == kMapBecameUnstable) {
467 if (FLAG_trace_opt) {
468 PrintF("[aborted optimizing ");
469 function->ShortPrint();
470 PrintF(" because a map became unstable]\n");
471 }
460 return AbortOptimization(); 472 return AbortOptimization();
461 } 473 }
462 return AbortAndDisableOptimization(); 474 return AbortAndDisableOptimization();
463 } 475 }
464 info()->SetCode(optimized_code); 476 info()->SetCode(optimized_code);
465 } 477 }
466 RecordOptimizationStats(); 478 RecordOptimizationStats();
467 // Add to the weak list of optimized code objects. 479 // Add to the weak list of optimized code objects.
468 info()->context()->native_context()->AddOptimizedCode(*info()->code()); 480 info()->context()->native_context()->AddOptimizedCode(*info()->code());
469 return SetLastStatus(SUCCEEDED); 481 return SetLastStatus(SUCCEEDED);
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 AllowHandleDereference allow_deref; 1299 AllowHandleDereference allow_deref;
1288 bool tracing_on = info()->IsStub() 1300 bool tracing_on = info()->IsStub()
1289 ? FLAG_trace_hydrogen_stubs 1301 ? FLAG_trace_hydrogen_stubs
1290 : (FLAG_trace_hydrogen && 1302 : (FLAG_trace_hydrogen &&
1291 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter)); 1303 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter));
1292 return (tracing_on && 1304 return (tracing_on &&
1293 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); 1305 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL);
1294 } 1306 }
1295 1307
1296 } } // namespace v8::internal 1308 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698