diff options
| author | Ali Ijaz Sheikh <ofrobots@google.com> | 2015-08-23 06:09:40 -0700 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-09-06 21:38:01 +1000 |
| commit | 9fddd83cf9adf505bce2e2373881df0c4d41b261 (patch) | |
| tree | 4272ce14c10fea496af2e78fc6debb187d613451 /deps/v8/src/ic/ic-state.cc | |
| parent | 46b7d151674d138e7ea4342d5f3ada1208b87ff2 (diff) | |
| download | node-new-9fddd83cf9adf505bce2e2373881df0c4d41b261.tar.gz | |
deps: upgrade V8 to 4.5.103.24
Upgrade to the latest branch-head for V8 4.5. For the full commit log see
https://github.com/v8/v8-git-mirror/commits/4.5.103.24
PR-URL: https://github.com/nodejs/node/pull/2509
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/ic/ic-state.cc')
| -rw-r--r-- | deps/v8/src/ic/ic-state.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/deps/v8/src/ic/ic-state.cc b/deps/v8/src/ic/ic-state.cc index 0c71949d8a..8ab08bc08d 100644 --- a/deps/v8/src/ic/ic-state.cc +++ b/deps/v8/src/ic/ic-state.cc @@ -12,7 +12,7 @@ namespace internal { // static void ICUtility::Clear(Isolate* isolate, Address address, - ConstantPoolArray* constant_pool) { + Address constant_pool) { IC::Clear(isolate, address, constant_pool); } @@ -52,7 +52,7 @@ BinaryOpICState::BinaryOpICState(Isolate* isolate, ExtraICState extra_ic_state) isolate_(isolate) { op_ = static_cast<Token::Value>(FIRST_TOKEN + OpField::decode(extra_ic_state)); - strong_ = StrongField::decode(extra_ic_state); + strong_ = StrengthField::decode(extra_ic_state); left_kind_ = LeftKindField::decode(extra_ic_state); right_kind_ = fixed_right_arg_.IsJust() ? (Smi::IsValid(fixed_right_arg_.FromJust()) ? SMI : INT32) @@ -66,8 +66,7 @@ BinaryOpICState::BinaryOpICState(Isolate* isolate, ExtraICState extra_ic_state) ExtraICState BinaryOpICState::GetExtraICState() const { ExtraICState extra_ic_state = OpField::encode(op_ - FIRST_TOKEN) | LeftKindField::encode(left_kind_) | - ResultKindField::encode(result_kind_) | - StrongField::encode(strong_) | + ResultKindField::encode(result_kind_) | StrengthField::encode(strong_) | HasFixedRightArgField::encode(fixed_right_arg_.IsJust()); if (fixed_right_arg_.IsJust()) { extra_ic_state = FixedRightArgValueField::update( @@ -86,14 +85,14 @@ void BinaryOpICState::GenerateAheadOfTime( // expensive at runtime. When solved we should be able to add most binops to // the snapshot instead of hand-picking them. // Generated list of commonly used stubs -#define GENERATE(op, left_kind, right_kind, result_kind) \ - do { \ - BinaryOpICState state(isolate, op, LanguageMode::SLOPPY); \ - state.left_kind_ = left_kind; \ - state.fixed_right_arg_ = Nothing<int>(); \ - state.right_kind_ = right_kind; \ - state.result_kind_ = result_kind; \ - Generate(isolate, state); \ +#define GENERATE(op, left_kind, right_kind, result_kind) \ + do { \ + BinaryOpICState state(isolate, op, Strength::WEAK); \ + state.left_kind_ = left_kind; \ + state.fixed_right_arg_ = Nothing<int>(); \ + state.right_kind_ = right_kind; \ + state.result_kind_ = result_kind; \ + Generate(isolate, state); \ } while (false) GENERATE(Token::ADD, INT32, INT32, INT32); GENERATE(Token::ADD, INT32, INT32, NUMBER); @@ -190,7 +189,7 @@ void BinaryOpICState::GenerateAheadOfTime( #undef GENERATE #define GENERATE(op, left_kind, fixed_right_arg_value, result_kind) \ do { \ - BinaryOpICState state(isolate, op, LanguageMode::SLOPPY); \ + BinaryOpICState state(isolate, op, Strength::WEAK); \ state.left_kind_ = left_kind; \ state.fixed_right_arg_ = Just(fixed_right_arg_value); \ state.right_kind_ = SMI; \ @@ -224,6 +223,7 @@ Type* BinaryOpICState::GetResultType(Zone* zone) const { std::ostream& operator<<(std::ostream& os, const BinaryOpICState& s) { os << "(" << Token::Name(s.op_); if (s.CouldCreateAllocationMementos()) os << "_CreateAllocationMementos"; + if (is_strong(s.strength())) os << "_Strong"; os << ":" << BinaryOpICState::KindToString(s.left_kind_) << "*"; if (s.fixed_right_arg_.IsJust()) { os << s.fixed_right_arg_.FromJust(); @@ -511,5 +511,5 @@ CompareICState::State CompareICState::TargetState( UNREACHABLE(); return GENERIC; // Make the compiler happy. } -} -} // namespace v8::internal +} // namespace internal +} // namespace v8 |