Index: src/stub-cache.cc |
diff --git a/src/stub-cache.cc b/src/stub-cache.cc |
index 38f1960594e400960903ab4588d6c27e971c5d56..28ffc91ce27864eb4f94e8e3cb320674837e95af 100644 |
--- a/src/stub-cache.cc |
+++ b/src/stub-cache.cc |
@@ -888,7 +888,7 @@ static MaybeObject* ThrowReferenceError(Isolate* isolate, Name* name) { |
HandleScope scope(isolate); |
IC ic(IC::NO_EXTRA_FRAME, isolate); |
ASSERT(ic.IsLoadStub()); |
- if (!ic.IsContextual()) { |
+ if (!ic.IsContextualLoad()) { |
return isolate->heap()->undefined_value(); |
} |
@@ -1047,9 +1047,6 @@ Handle<Code> StubCompiler::CompileCallNormal(Code::Flags flags) { |
int argc = Code::ExtractArgumentsCountFromFlags(flags); |
Code::Kind kind = Code::ExtractKindFromFlags(flags); |
if (kind == Code::CALL_IC) { |
- // Call normal is always with a explict receiver. |
- ASSERT(!CallIC::Contextual::decode( |
- Code::ExtractExtraICStateFromFlags(flags))); |
CallIC::GenerateNormal(masm(), argc); |
} else { |
KeyedCallIC::GenerateNormal(masm(), argc); |
@@ -1105,7 +1102,7 @@ Handle<Code> StubCompiler::CompileLoadPreMonomorphic(Code::Flags flags) { |
Handle<Code> StubCompiler::CompileLoadMegamorphic(Code::Flags flags) { |
ExtraICState extra_state = Code::ExtractExtraICStateFromFlags(flags); |
- ContextualMode mode = IC::GetContextualMode(extra_state); |
+ ContextualMode mode = LoadIC::GetContextualMode(extra_state); |
LoadIC::GenerateMegamorphic(masm(), mode); |
Handle<Code> code = GetCodeWithFlags(flags, "CompileLoadMegamorphic"); |
PROFILE(isolate(), |