Reviewers: Yang,

Description:
Merged r14408 into trunk branch.

Fix clang build for x64.

[email protected]

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

SVN Base: https://v8.googlecode.com/svn/trunk

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


Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 867a4b3c2631491f04e64f9f4083036e79710a45..1c224b9017e20391c496f5192dac2e07834910cd 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     18
 #define BUILD_NUMBER      3
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0
Index: src/x64/stub-cache-x64.cc
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index 40f55909713831bc93ef95066e799c944cabb765..54d2a113a73724fa39b79b10aad72b503ff9f356 100644
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -623,7 +623,8 @@ class CallInterceptorCompiler BASE_EMBEDDED {
           ? CALL_AS_FUNCTION
           : CALL_AS_METHOD;
       Handle<JSFunction> fun = optimization.constant_function();
-      __ InvokeFunction(fun, ParameterCount(fun), arguments_,
+      ParameterCount expected(fun);
+      __ InvokeFunction(fun, 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