Browse Source

deps: backport 200315c from V8 upstream

Original commit message:

  Make AstRawString deduplication encoding-agnostic.

  R=jkummerow@chromium.org
  BUG=v8:4450
  LOG=N

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

  Cr-Commit-Position: refs/heads/master@{#31624}

Ref: https://github.com/nodejs/node/pull/4160
PR-URL: https://github.com/nodejs/node/pull/4128
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
Reviewed-By: targos - Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com>
v4.x
Vladimir Kurchatkin 9 years ago
committed by Myles Borins
parent
commit
c3a9d8a62e
  1. 30
      deps/v8/src/ast-value-factory.cc
  2. 8
      deps/v8/test/mjsunit/regress/regress-4450.js

30
deps/v8/src/ast-value-factory.cc

@ -29,6 +29,7 @@
#include "src/api.h"
#include "src/objects.h"
#include "src/utils.h"
namespace v8 {
namespace internal {
@ -379,11 +380,32 @@ AstRawString* AstValueFactory::GetString(uint32_t hash, bool is_one_byte,
bool AstValueFactory::AstRawStringCompare(void* a, void* b) {
const AstRawString* lhs = static_cast<AstRawString*>(a);
const AstRawString* rhs = static_cast<AstRawString*>(b);
if (lhs->is_one_byte() != rhs->is_one_byte()) return false;
if (lhs->length() != rhs->length()) return false;
if (lhs->hash() != rhs->hash()) return false;
int len = lhs->byte_length();
if (rhs->byte_length() != len) return false;
return memcmp(lhs->raw_data(), rhs->raw_data(), len) == 0;
const unsigned char* l = lhs->raw_data();
const unsigned char* r = rhs->raw_data();
size_t length = rhs->length();
if (lhs->is_one_byte()) {
if (rhs->is_one_byte()) {
return CompareCharsUnsigned(reinterpret_cast<const uint8_t*>(l),
reinterpret_cast<const uint8_t*>(r),
length) == 0;
} else {
return CompareCharsUnsigned(reinterpret_cast<const uint8_t*>(l),
reinterpret_cast<const uint16_t*>(r),
length) == 0;
}
} else {
if (rhs->is_one_byte()) {
return CompareCharsUnsigned(reinterpret_cast<const uint16_t*>(l),
reinterpret_cast<const uint8_t*>(r),
length) == 0;
} else {
return CompareCharsUnsigned(reinterpret_cast<const uint16_t*>(l),
reinterpret_cast<const uint16_t*>(r),
length) == 0;
}
}
}
} // namespace internal
} // namespace v8

8
deps/v8/test/mjsunit/regress/regress-4450.js

@ -0,0 +1,8 @@
// Copyright 2015 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
({})['foobar\u2653'.slice(0, 6)] = null;
var x;
eval('x = function foobar() { return foobar };');
x();
Loading…
Cancel
Save