[v8-dev] Fix clang build. (issue 14091011)

Tue, 23 Apr 2013 02:37:43 -0700 

Reviewers: mvstanton,

Description:
Fix clang build.

[email protected]
BUG=

Please review this at https://chromiumcodereview.appspot.com/14091011/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M src/arm/stub-cache-arm.cc
  M src/ia32/stub-cache-ia32.cc
  M src/x64/stub-cache-x64.cc


Index: src/arm/stub-cache-arm.cc
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
index 8b5731b2773f88d05941f37cc10dbd7d13571aee..4e4b347959aebdad87f71173cc352ffad25968bb 100644 
--- a/src/arm/stub-cache-arm.cc
+++ b/src/arm/stub-cache-arm.cc
@@ -954,8 +954,9 @@ class CallInterceptorCompiler BASE_EMBEDDED {
       CallKind call_kind = CallICBase::Contextual::decode(extra_ic_state_)
           ? CALL_AS_FUNCTION
           : CALL_AS_METHOD;
-      Handle<JSFunction> fun = optimization.constant_function();
-      __ InvokeFunction(fun, ParameterCount(fun), arguments_,
+      Handle<JSFunction> function = optimization.constant_function();
+      ParameterCount expected(function);
+      __ InvokeFunction(function, expected, arguments_,
                         JUMP_FUNCTION, NullCallWrapper(), call_kind);
     }
@@ -2085,7 +2086,8 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall( 
   // Tail call the full function. We do not have to patch the receiver
   // because the function makes no use of it.
   __ bind(&slow);
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);

   __ bind(&miss);
@@ -2196,7 +2198,8 @@ Handle<Code> CallStubCompiler::CompileMathFloorCall(
   __ bind(&slow);
   // Tail call the full function. We do not have to patch the receiver
   // because the function makes no use of it.
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(fun);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);

   __ bind(&miss);
@@ -2295,7 +2298,8 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall(
   // Tail call the full function. We do not have to patch the receiver
   // because the function makes no use of it.
   __ bind(&slow);
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);

   __ bind(&miss);
@@ -2470,7 +2474,8 @@ void CallStubCompiler::CompileHandlerBackend(Handle<JSFunction> function) { 
   CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
       ? CALL_AS_FUNCTION
       : CALL_AS_METHOD;
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), call_kind);
 }

Index: src/ia32/stub-cache-ia32.cc
diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc
index 14ad06c1c94079c950d8337f6145f2428ff5cfe0..a44beec299a39ce120f929ea22d323f913afc274 100644 
--- a/src/ia32/stub-cache-ia32.cc
+++ b/src/ia32/stub-cache-ia32.cc
@@ -635,8 +635,9 @@ class CallInterceptorCompiler BASE_EMBEDDED {
       CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
           ? CALL_AS_FUNCTION
           : CALL_AS_METHOD;
-      Handle<JSFunction> fun = optimization.constant_function();
-      __ InvokeFunction(fun, ParameterCount(fun), arguments_,
+      Handle<JSFunction> function = optimization.constant_function();
+      ParameterCount expected(function);
+      __ InvokeFunction(function, expected, arguments_,
                         JUMP_FUNCTION, NullCallWrapper(), call_kind);
     }
@@ -2057,7 +2058,8 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall( 
   CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
       ? CALL_AS_FUNCTION
       : CALL_AS_METHOD;
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), call_kind);

   __ bind(&miss);
@@ -2187,7 +2189,8 @@ Handle<Code> CallStubCompiler::CompileMathFloorCall(
   // Tail call the full function. We do not have to patch the receiver
   // because the function makes no use of it.
   __ bind(&slow);
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);

   __ bind(&miss);
@@ -2292,7 +2295,8 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall(
   // Tail call the full function. We do not have to patch the receiver
   // because the function makes no use of it.
   __ bind(&slow);
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);

   __ bind(&miss);
@@ -2475,7 +2479,8 @@ void CallStubCompiler::CompileHandlerBackend(Handle<JSFunction> function) { 
   CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
       ? CALL_AS_FUNCTION
       : CALL_AS_METHOD;
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), call_kind);
 }

Index: src/x64/stub-cache-x64.cc
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index 4aa9a7cc695d70000de5d3c46f50528d7bca5587..0384d25215f6bdad1d7555968b504b58711cca4f 100644 
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -1992,7 +1992,8 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall( 
   CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
       ? CALL_AS_FUNCTION
       : CALL_AS_METHOD;
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), call_kind);

   __ bind(&miss);
@@ -2107,7 +2108,8 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall(
   CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
       ? CALL_AS_FUNCTION
       : CALL_AS_METHOD;
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), call_kind);

   __ bind(&miss);
@@ -2291,7 +2293,8 @@ void CallStubCompiler::CompileHandlerBackend(Handle<JSFunction> function) { 
   CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
       ? CALL_AS_FUNCTION
       : CALL_AS_METHOD;
-  __ InvokeFunction(function, ParameterCount(function), arguments(),
+  ParameterCount expected(function);
+  __ InvokeFunction(function, expected, arguments(),
                     JUMP_FUNCTION, NullCallWrapper(), call_kind);
 }



--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group. 
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to