Index: src/code-stubs.h |
diff --git a/src/code-stubs.h b/src/code-stubs.h |
index 207af47c8e8ead3ecb3a01b3f56aa5c993c8567b..81bbb52a1fe8f464e1b12c0377138b82a99f8d70 100644 |
--- a/src/code-stubs.h |
+++ b/src/code-stubs.h |
@@ -158,14 +158,14 @@ class CodeStub BASE_EMBEDDED { |
virtual ~CodeStub() {} |
bool CompilingCallsToThisStubIsGCSafe(Isolate* isolate) { |
- bool is_pregenerated = IsPregenerated(); |
+ bool is_pregenerated = IsPregenerated(isolate); |
Code* code = NULL; |
CHECK(!is_pregenerated || FindCodeInCache(&code, isolate)); |
return is_pregenerated; |
} |
// See comment above, where Instanceof is defined. |
- virtual bool IsPregenerated() { return false; } |
+ virtual bool IsPregenerated(Isolate* isolate) { return false; } |
static void GenerateStubsAheadOfTime(Isolate* isolate); |
static void GenerateFPStubs(Isolate* isolate); |
@@ -682,7 +682,7 @@ class CreateAllocationSiteStub : public HydrogenCodeStub { |
virtual Handle<Code> GenerateCode(Isolate* isolate); |
- virtual bool IsPregenerated() { return true; } |
+ virtual bool IsPregenerated(Isolate* isolate) V8_OVERRIDE { return true; } |
static void GenerateAheadOfTime(Isolate* isolate); |
@@ -1305,7 +1305,7 @@ class CEntryStub : public PlatformCodeStub { |
// time, so it's OK to call it from other stubs that can't cope with GC during |
// their code generation. On machines that always have gp registers (x64) we |
// can generate both variants ahead of time. |
- virtual bool IsPregenerated(); |
+ virtual bool IsPregenerated(Isolate* isolate) V8_OVERRIDE; |
static void GenerateAheadOfTime(Isolate* isolate); |
private: |
@@ -1317,6 +1317,7 @@ class CEntryStub : public PlatformCodeStub { |
bool always_allocate_scope); |
// Number of pointers/values returned. |
+ Isolate* isolate_; |
const int result_size_; |
SaveFPRegsMode save_doubles_; |
@@ -1895,7 +1896,7 @@ class ArrayConstructorStubBase : public HydrogenCodeStub { |
return ContextCheckModeBits::decode(bit_field_); |
} |
- virtual bool IsPregenerated() { |
+ virtual bool IsPregenerated(Isolate* isolate) V8_OVERRIDE { |
// We only pre-generate stubs that verify correct context |
return context_mode() == CONTEXT_CHECK_REQUIRED; |
} |
@@ -1996,7 +1997,7 @@ class InternalArrayConstructorStubBase : public HydrogenCodeStub { |
kind_ = kind; |
} |
- virtual bool IsPregenerated() { return true; } |
+ virtual bool IsPregenerated(Isolate* isolate) V8_OVERRIDE { return true; } |
static void GenerateStubsAheadOfTime(Isolate* isolate); |
static void InstallDescriptors(Isolate* isolate); |
@@ -2260,7 +2261,7 @@ class StubFailureTrampolineStub : public PlatformCodeStub { |
explicit StubFailureTrampolineStub(StubFunctionMode function_mode) |
: fp_registers_(CanUseFPRegisters()), function_mode_(function_mode) {} |
- virtual bool IsPregenerated() { return true; } |
+ virtual bool IsPregenerated(Isolate* isolate) V8_OVERRIDE { return true; } |
static void GenerateAheadOfTime(Isolate* isolate); |