From ef15f83bc382f9cc3bae304cafeb954578aa442f Mon Sep 17 00:00:00 2001
From: bmeurer <bmeurer@chromium.org>
Date: Mon, 27 Apr 2015 22:09:24 -0700
Subject: [PATCH] [turbofan] Better fix for Win64 after r28066.

TBR=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/1107253003

Cr-Commit-Position: refs/heads/master@{#28092}
---
 src/compiler/js-operator.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/compiler/js-operator.h b/src/compiler/js-operator.h
index f2ab962..dc002e1 100644
--- a/src/compiler/js-operator.h
+++ b/src/compiler/js-operator.h
@@ -23,8 +23,7 @@ class CallFunctionParameters final {
  public:
   CallFunctionParameters(size_t arity, CallFunctionFlags flags,
                          LanguageMode language_mode)
-      : bit_field_(ArityField::encode(static_cast<unsigned>(arity)) |
-                   FlagsField::encode(flags) |
+      : bit_field_(ArityField::encode(arity) | FlagsField::encode(flags) |
                    LanguageModeField::encode(language_mode)) {}
 
   size_t arity() const { return ArityField::decode(bit_field_); }
@@ -45,7 +44,7 @@ class CallFunctionParameters final {
     return p.bit_field_;
   }
 
-  typedef BitField<unsigned, 0, 28> ArityField;
+  typedef BitField<size_t, 0, 28> ArityField;
   typedef BitField<CallFunctionFlags, 28, 2> FlagsField;
   typedef BitField<LanguageMode, 30, 2> LanguageModeField;
 
-- 
2.7.4