| Index: src/ia32/full-codegen-ia32.cc
|
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
|
| index 6b687e5bb77a2486403bc7d321849cc2fe1e2281..96d96a34ff64a6affc55a9c321f3c16ca59acab1 100644
|
| --- a/src/ia32/full-codegen-ia32.cc
|
| +++ b/src/ia32/full-codegen-ia32.cc
|
| @@ -12,6 +12,7 @@
|
| #include "src/compiler.h"
|
| #include "src/debug.h"
|
| #include "src/full-codegen.h"
|
| +#include "src/ic/ic.h"
|
| #include "src/isolate-inl.h"
|
| #include "src/parser.h"
|
| #include "src/scopes.h"
|
| @@ -2546,11 +2547,10 @@ void FullCodeGenerator::CallIC(Handle<Code> code,
|
| void FullCodeGenerator::EmitCallWithLoadIC(Call* expr) {
|
| Expression* callee = expr->expression();
|
|
|
| - CallIC::CallType call_type = callee->IsVariableProxy()
|
| - ? CallIC::FUNCTION
|
| - : CallIC::METHOD;
|
| + CallICState::CallType call_type =
|
| + callee->IsVariableProxy() ? CallICState::FUNCTION : CallICState::METHOD;
|
| // Get the target function.
|
| - if (call_type == CallIC::FUNCTION) {
|
| + if (call_type == CallICState::FUNCTION) {
|
| { StackValueContext context(this);
|
| EmitVariableLoad(callee->AsVariableProxy());
|
| PrepareForBailout(callee, NO_REGISTERS);
|
| @@ -2592,11 +2592,11 @@ void FullCodeGenerator::EmitKeyedCallWithLoadIC(Call* expr,
|
| __ push(Operand(esp, 0));
|
| __ mov(Operand(esp, kPointerSize), eax);
|
|
|
| - EmitCall(expr, CallIC::METHOD);
|
| + EmitCall(expr, CallICState::METHOD);
|
| }
|
|
|
|
|
| -void FullCodeGenerator::EmitCall(Call* expr, CallIC::CallType call_type) {
|
| +void FullCodeGenerator::EmitCall(Call* expr, CallICState::CallType call_type) {
|
| // Load the arguments.
|
| ZoneList<Expression*>* args = expr->arguments();
|
| int arg_count = args->length();
|
|
|