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

Side by Side Diff: src/compiler.cc

Issue 22404007: Set bailout reason to kCodeGenerationFailed only when it is not set yet (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
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 | « 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 // 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 Timer timer(this, &time_taken_to_codegen_); 478 Timer timer(this, &time_taken_to_codegen_);
479 ASSERT(chunk_ != NULL); 479 ASSERT(chunk_ != NULL);
480 ASSERT(graph_ != NULL); 480 ASSERT(graph_ != NULL);
481 // Deferred handles reference objects that were accessible during 481 // Deferred handles reference objects that were accessible during
482 // graph creation. To make sure that we don't encounter inconsistencies 482 // graph creation. To make sure that we don't encounter inconsistencies
483 // between graph creation and code generation, we disallow accessing 483 // between graph creation and code generation, we disallow accessing
484 // objects through deferred handles during the latter, with exceptions. 484 // objects through deferred handles during the latter, with exceptions.
485 DisallowDeferredHandleDereference no_deferred_handle_deref; 485 DisallowDeferredHandleDereference no_deferred_handle_deref;
486 Handle<Code> optimized_code = chunk_->Codegen(); 486 Handle<Code> optimized_code = chunk_->Codegen();
487 if (optimized_code.is_null()) { 487 if (optimized_code.is_null()) {
488 if (info()->bailout_reason() != kNoReason) { 488 if (info()->bailout_reason() == kNoReason) {
489 info()->set_bailout_reason(kCodeGenerationFailed); 489 info()->set_bailout_reason(kCodeGenerationFailed);
490 } 490 }
491 return AbortOptimization(); 491 return AbortOptimization();
492 } 492 }
493 info()->SetCode(optimized_code); 493 info()->SetCode(optimized_code);
494 } 494 }
495 RecordOptimizationStats(); 495 RecordOptimizationStats();
496 return SetLastStatus(SUCCEEDED); 496 return SetLastStatus(SUCCEEDED);
497 } 497 }
498 498
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 // Trace if the appropriate trace flag is set and the phase name's first 1255 // Trace if the appropriate trace flag is set and the phase name's first
1256 // character is in the FLAG_trace_phase command line parameter. 1256 // character is in the FLAG_trace_phase command line parameter.
1257 bool tracing_on = info()->IsStub() ? 1257 bool tracing_on = info()->IsStub() ?
1258 FLAG_trace_hydrogen_stubs : 1258 FLAG_trace_hydrogen_stubs :
1259 FLAG_trace_hydrogen; 1259 FLAG_trace_hydrogen;
1260 return (tracing_on && 1260 return (tracing_on &&
1261 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); 1261 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL);
1262 } 1262 }
1263 1263
1264 } } // namespace v8::internal 1264 } } // 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