Index: src/compiler/pipeline.cc |
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc |
index 70de7fb0efed28ef7d30f20680f018ad91fb7b9c..eb9ed4c26828a6705d25242da1ad3bd09cddb9a9 100644 |
--- a/src/compiler/pipeline.cc |
+++ b/src/compiler/pipeline.cc |
@@ -8,6 +8,7 @@ |
#include <sstream> |
#include "src/base/platform/elapsed-timer.h" |
+#include "src/bootstrapper.h" // TODO(mstarzinger): Only temporary. |
#include "src/compiler/ast-graph-builder.h" |
#include "src/compiler/ast-loop-assignment-analyzer.h" |
#include "src/compiler/basic-block-instrumentor.h" |
@@ -754,6 +755,11 @@ Handle<Code> Pipeline::GenerateCode() { |
// TODO(turbofan): Make OSR work with inner loops and remove this bailout. |
if (info()->is_osr() && !FLAG_turbo_osr) return Handle<Code>::null(); |
+ // TODO(mstarzinger): This is just a temporary hack to make TurboFan work, |
+ // the correct solution is to restore the context register after invoking |
+ // builtins from full-codegen. |
+ if (isolate()->bootstrapper()->IsActive()) return Handle<Code>::null(); |
+ |
ZonePool zone_pool(isolate()); |
SmartPointer<PipelineStatistics> pipeline_statistics; |