Chromium Code Reviews| Index: src/isolate.cc |
| diff --git a/src/isolate.cc b/src/isolate.cc |
| index 61d2b2d89d05888261129db687b60efcc8def66e..e522942eb6d41d41f6977b83accd5455cd6bbbdf 100644 |
| --- a/src/isolate.cc |
| +++ b/src/isolate.cc |
| @@ -1,4 +1,4 @@ |
| -// Copyright 2012 the V8 project authors. All rights reserved. |
| +// Copyright 2013 the V8 project authors. All rights reserved. |
|
Michael Starzinger
2013/02/21 19:39:23
I thought we don't change the copyright year anymo
danno
2013/02/25 11:11:23
Done.
|
| // Redistribution and use in source and binary forms, with or without |
| // modification, are permitted provided that the following conditions are |
| // met: |
| @@ -2038,9 +2038,16 @@ bool Isolate::Init(Deserializer* des) { |
| stack_guard_.InitThread(lock); |
| } |
| + ASSERT(!heap_.HasBeenSetUp()); |
| + if (!heap_.Prepare()) { |
| + V8::FatalProcessOutOfMemory("heap preparation"); |
| + return false; |
| + } |
| + |
| + deoptimizer_data_ = new DeoptimizerData; |
| + |
| // SetUp the object heap. |
| const bool create_heap_objects = (des == NULL); |
| - ASSERT(!heap_.HasBeenSetUp()); |
| if (!heap_.SetUp(create_heap_objects)) { |
| V8::FatalProcessOutOfMemory("heap setup"); |
| return false; |
| @@ -2076,8 +2083,6 @@ bool Isolate::Init(Deserializer* des) { |
| debug_->SetUp(create_heap_objects); |
| #endif |
| - deoptimizer_data_ = new DeoptimizerData; |
| - |
| // If we are deserializing, read the state into the now-empty heap. |
| if (!create_heap_objects) { |
| des->Deserialize(); |