| OLD | NEW |
| 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 2425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2436 | 2436 |
| 2437 if (cond_false->HasPredecessor()) { | 2437 if (cond_false->HasPredecessor()) { |
| 2438 cond_false->SetJoinId(stmt->ElseId()); | 2438 cond_false->SetJoinId(stmt->ElseId()); |
| 2439 set_current_block(cond_false); | 2439 set_current_block(cond_false); |
| 2440 CHECK_BAILOUT(Visit(stmt->else_statement())); | 2440 CHECK_BAILOUT(Visit(stmt->else_statement())); |
| 2441 cond_false = current_block(); | 2441 cond_false = current_block(); |
| 2442 } else { | 2442 } else { |
| 2443 cond_false = NULL; | 2443 cond_false = NULL; |
| 2444 } | 2444 } |
| 2445 | 2445 |
| 2446 HBasicBlock* join = CreateJoin(cond_true, cond_false, stmt->id()); | 2446 HBasicBlock* join = CreateJoin(cond_true, cond_false, stmt->IfId()); |
| 2447 set_current_block(join); | 2447 set_current_block(join); |
| 2448 } | 2448 } |
| 2449 } | 2449 } |
| 2450 | 2450 |
| 2451 | 2451 |
| 2452 HBasicBlock* HGraphBuilder::BreakAndContinueScope::Get( | 2452 HBasicBlock* HGraphBuilder::BreakAndContinueScope::Get( |
| 2453 BreakableStatement* stmt, | 2453 BreakableStatement* stmt, |
| 2454 BreakType type) { | 2454 BreakType type) { |
| 2455 BreakAndContinueScope* current = this; | 2455 BreakAndContinueScope* current = this; |
| 2456 while (current != NULL && current->info()->target() != stmt) { | 2456 while (current != NULL && current->info()->target() != stmt) { |
| (...skipping 3849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6306 } | 6306 } |
| 6307 } | 6307 } |
| 6308 | 6308 |
| 6309 #ifdef DEBUG | 6309 #ifdef DEBUG |
| 6310 if (graph_ != NULL) graph_->Verify(); | 6310 if (graph_ != NULL) graph_->Verify(); |
| 6311 if (allocator_ != NULL) allocator_->Verify(); | 6311 if (allocator_ != NULL) allocator_->Verify(); |
| 6312 #endif | 6312 #endif |
| 6313 } | 6313 } |
| 6314 | 6314 |
| 6315 } } // namespace v8::internal | 6315 } } // namespace v8::internal |
| OLD | NEW |