Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
201c2d9
deps: V8: cherry-pick 516b5d3f9cfe
targos Apr 17, 2021
8e9415c
deps: V8: cherry-pick a59e3ac1d7fa
targos Apr 17, 2021
a8a9562
deps: V8: cherry-pick abb4d0a431c0
targos Apr 17, 2021
7b7d5c1
deps: V8: cherry-pick 33f4064dbad3
targos Apr 17, 2021
a0cd0e6
deps: V8: cherry-pick d724820c1d5d
targos Apr 17, 2021
79cbe4c
deps: V8: cherry-pick 6a4cd97d6691
targos Apr 17, 2021
042ff7b
deps: V8: cherry-pick ed3eedae33d0
targos Apr 17, 2021
3936f4f
deps: V8: cherry-pick 8c725f7b5bbf
targos Apr 17, 2021
df2459d
deps: V8: cherry-pick 3ba21a17ce2f
targos Apr 17, 2021
7249e8c
deps: V8: cherry-pick c449afa1953b
targos Apr 17, 2021
ca4c625
deps: V8: cherry-pick 412ac52d8246
targos Apr 17, 2021
b3307a1
deps: V8: cherry-pick 482e5c7750b3
targos Apr 17, 2021
e319c63
deps: V8: cherry-pick ad2c5dae4688
targos Apr 17, 2021
39627e6
deps: V8: cherry-pick 5c6c99a8dc72
targos Apr 17, 2021
4110028
deps: V8: cherry-pick e527ba4bf8af
targos Apr 17, 2021
6506918
deps: V8: cherry-pick 53c4d057974a
targos Apr 17, 2021
92c9f62
deps: V8: cherry-pick d2283ba066ba
targos Apr 17, 2021
9803b55
deps: V8: cherry-pick 813066946968
targos Apr 17, 2021
14f68be
deps: V8: cherry-pick 5678ebe8f6c4
targos Apr 17, 2021
a461185
deps: V8: cherry-pick 254c7945eea2
targos Apr 17, 2021
022356d
deps: V8: cherry-pick 3066b7b2fcb3
targos Apr 17, 2021
03c1d2e
deps: V8: cherry-pick 1e35f6472510
targos Apr 17, 2021
e7472f1
deps: V8: cherry-pick 8ebd894186ed
targos Apr 17, 2021
c38bbfc
deps: V8: cherry-pick 1a7d55a9a427
targos Apr 17, 2021
695eb84
deps: V8: cherry-pick 93b2105fbe44
targos Apr 17, 2021
dd2fc44
deps: V8: cherry-pick f44fcbf803ac
targos Apr 17, 2021
caca453
deps: V8: cherry-pick 6771d3e31883
targos Apr 17, 2021
02584c6
deps: V8: cherry-pick eddb82330975
targos Apr 17, 2021
3dcf5d8
deps: V8: cherry-pick 4e24c353d812
targos Apr 18, 2021
374a40f
deps: V8: cherry-pick be91c6c50818
targos Apr 18, 2021
6d9800e
build: do not pass mode option to test-v8 command
targos Oct 19, 2020
72d8e9d
deps: V8: cherry-pick bbc59d124ef3
targos Apr 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps: V8: cherry-pick be91c6c50818
Original commit message:

    [compiler][cleanup] Move Make(String|Name) helper methods to cctest.h

    Several tests were using them and we can dedup code.

    Change-Id: I4ef5ae5772856d1f36e965b6b62ff5895b4e04fb
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2215173
    Reviewed-by: Maya Lekova <mslekova@chromium.org>
    Commit-Queue: Santiago Aboy Solanes <solanes@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#67974}

Refs: v8/v8@be91c6c
  • Loading branch information
targos committed Apr 27, 2021
commit 374a40fb36a222489151327076eaf4fb9625c101
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.58',
'v8_embedder_string': '-node.59',

##### V8 defaults for Node.js #####

Expand Down
12 changes: 12 additions & 0 deletions deps/v8/test/cctest/cctest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,18 @@ void CcTest::PreciseCollectAllGarbage(i::Isolate* isolate) {
i::GarbageCollectionReason::kTesting);
}

i::Handle<i::String> CcTest::MakeString(const char* str) {
i::Isolate* isolate = CcTest::i_isolate();
i::Factory* factory = isolate->factory();
return factory->InternalizeUtf8String(str);
}

i::Handle<i::String> CcTest::MakeName(const char* str, int suffix) {
i::EmbeddedVector<char, 128> buffer;
SNPrintF(buffer, "%s%d", str, suffix);
return CcTest::MakeString(buffer.begin());
}

v8::base::RandomNumberGenerator* CcTest::random_number_generator() {
return InitIsolateOnce()->random_number_generator();
}
Expand Down
3 changes: 3 additions & 0 deletions deps/v8/test/cctest/cctest.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ class CcTest {
static void CollectAllAvailableGarbage(i::Isolate* isolate = nullptr);
static void PreciseCollectAllGarbage(i::Isolate* isolate = nullptr);

static i::Handle<i::String> MakeString(const char* str);
static i::Handle<i::String> MakeName(const char* str, int suffix);

static v8::base::RandomNumberGenerator* random_number_generator();

static v8::Local<v8::Object> global();
Expand Down
22 changes: 5 additions & 17 deletions deps/v8/test/cctest/test-code-stub-assembler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,6 @@ template <class T>
using TVariable = TypedCodeAssemblerVariable<T>;
using PromiseResolvingFunctions = TorqueStructPromiseResolvingFunctions;

Handle<String> MakeString(const char* str) {
Isolate* isolate = CcTest::i_isolate();
Factory* factory = isolate->factory();
return factory->InternalizeUtf8String(str);
}

Handle<String> MakeName(const char* str, int suffix) {
EmbeddedVector<char, 128> buffer;
SNPrintF(buffer, "%s%d", str, suffix);
return MakeString(buffer.begin());
}

intptr_t sum10(intptr_t a0, intptr_t a1, intptr_t a2, intptr_t a3, intptr_t a4,
intptr_t a5, intptr_t a6, intptr_t a7, intptr_t a8,
intptr_t a9) {
Expand Down Expand Up @@ -1091,7 +1079,7 @@ TEST(TransitionLookup) {
name = factory->NewSymbol();
} else {
int random_key = rand_gen.NextInt(Smi::kMaxValue);
name = MakeName("p", random_key);
name = CcTest::MakeName("p", random_key);
}
keys[i] = name;

Expand Down Expand Up @@ -3646,8 +3634,8 @@ TEST(TestCallBuiltinInlineTrampoline) {
options.use_pc_relative_calls_and_jumps = false;
options.isolate_independent_code = false;
FunctionTester ft(asm_tester.GenerateCode(options), kNumParams);
MaybeHandle<Object> result = ft.Call(MakeString("abcdef"));
CHECK(String::Equals(isolate, MakeString("abcdefabcdef"),
MaybeHandle<Object> result = ft.Call(CcTest::MakeString("abcdef"));
CHECK(String::Equals(isolate, CcTest::MakeString("abcdefabcdef"),
Handle<String>::cast(result.ToHandleChecked())));
}

Expand All @@ -3672,8 +3660,8 @@ DISABLED_TEST(TestCallBuiltinIndirectLoad) {
options.use_pc_relative_calls_and_jumps = false;
options.isolate_independent_code = true;
FunctionTester ft(asm_tester.GenerateCode(options), kNumParams);
MaybeHandle<Object> result = ft.Call(MakeString("abcdef"));
CHECK(String::Equals(isolate, MakeString("abcdefabcdef"),
MaybeHandle<Object> result = ft.Call(CcTest::MakeString("abcdef"));
CHECK(String::Equals(isolate, CcTest::MakeString("abcdefabcdef"),
Handle<String>::cast(result.ToHandleChecked())));
}

Expand Down
73 changes: 30 additions & 43 deletions deps/v8/test/cctest/test-elements-kind.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,6 @@ namespace test_elements_kind {

namespace {

Handle<String> MakeString(const char* str) {
Isolate* isolate = CcTest::i_isolate();
Factory* factory = isolate->factory();
return factory->InternalizeUtf8String(str);
}


Handle<String> MakeName(const char* str, int suffix) {
EmbeddedVector<char, 128> buffer;
SNPrintF(buffer, "%s%d", str, suffix);
return MakeString(buffer.begin());
}

template <typename T, typename M>
bool EQUALS(Isolate* isolate, Handle<T> left, Handle<M> right) {
if (*left == *right) return true;
Expand Down Expand Up @@ -127,7 +114,7 @@ TEST(JSObjectAddingProperties) {

// for the default constructor function no in-object properties are reserved
// hence adding a single property will initialize the property-array
Handle<String> name = MakeName("property", 0);
Handle<String> name = CcTest::MakeName("property", 0);
JSObject::DefinePropertyOrElementIgnoreAttributes(object, name, value, NONE)
.Check();
CHECK_NE(object->map(), *previous_map);
Expand Down Expand Up @@ -162,7 +149,7 @@ TEST(JSObjectInObjectAddingProperties) {
// we have reserved space for in-object properties, hence adding up to
// |nof_inobject_properties| will not create a property store
for (int i = 0; i < nof_inobject_properties; i++) {
Handle<String> name = MakeName("property", i);
Handle<String> name = CcTest::MakeName("property", i);
JSObject::DefinePropertyOrElementIgnoreAttributes(object, name, value, NONE)
.Check();
}
Expand All @@ -174,7 +161,7 @@ TEST(JSObjectInObjectAddingProperties) {
// adding one more property will not fit in the in-object properties, thus
// creating a property store
int index = nof_inobject_properties + 1;
Handle<String> name = MakeName("property", index);
Handle<String> name = CcTest::MakeName("property", index);
JSObject::DefinePropertyOrElementIgnoreAttributes(object, name, value, NONE)
.Check();
CHECK_NE(object->map(), *previous_map);
Expand Down Expand Up @@ -205,7 +192,7 @@ TEST(JSObjectAddingElements) {
CHECK(EQUALS(isolate, object->elements(), empty_fixed_array));

// Adding an indexed element initializes the elements array
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(object, name, value, NONE)
.Check();
// no change in elements_kind => no map transition
Expand All @@ -217,7 +204,7 @@ TEST(JSObjectAddingElements) {
// Adding more consecutive elements without a change in the backing store
int non_dict_backing_store_limit = 100;
for (int i = 1; i < non_dict_backing_store_limit; i++) {
name = MakeName("", i);
name = CcTest::MakeName("", i);
JSObject::DefinePropertyOrElementIgnoreAttributes(object, name, value, NONE)
.Check();
}
Expand All @@ -229,7 +216,7 @@ TEST(JSObjectAddingElements) {

// Adding an element at an very large index causes a change to
// DICTIONARY_ELEMENTS
name = MakeString("100000000");
name = CcTest::MakeString("100000000");
JSObject::DefinePropertyOrElementIgnoreAttributes(object, name, value, NONE)
.Check();
// change in elements_kind => map transition
Expand Down Expand Up @@ -260,7 +247,7 @@ TEST(JSArrayAddingProperties) {

// for the default constructor function no in-object properties are reserved
// hence adding a single property will initialize the property-array
Handle<String> name = MakeName("property", 0);
Handle<String> name = CcTest::MakeName("property", 0);
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value, NONE)
.Check();
// No change in elements_kind but added property => new map
Expand Down Expand Up @@ -292,7 +279,7 @@ TEST(JSArrayAddingElements) {
CHECK_EQ(0, Smi::ToInt(array->length()));

// Adding an indexed element initializes the elements array
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value, NONE)
.Check();
// no change in elements_kind => no map transition
Expand All @@ -305,7 +292,7 @@ TEST(JSArrayAddingElements) {
// Adding more consecutive elements without a change in the backing store
int non_dict_backing_store_limit = 100;
for (int i = 1; i < non_dict_backing_store_limit; i++) {
name = MakeName("", i);
name = CcTest::MakeName("", i);
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value, NONE)
.Check();
}
Expand All @@ -319,7 +306,7 @@ TEST(JSArrayAddingElements) {
// Adding an element at an very large index causes a change to
// DICTIONARY_ELEMENTS
int index = 100000000;
name = MakeName("", index);
name = CcTest::MakeName("", index);
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value, NONE)
.Check();
// change in elements_kind => map transition
Expand All @@ -340,7 +327,7 @@ TEST(JSArrayAddingElementsGeneralizingiFastSmiElements) {

Handle<String> name;
Handle<Object> value_smi(Smi::FromInt(42), isolate);
Handle<Object> value_string(MakeString("value"));
Handle<Object> value_string(CcTest::MakeString("value"));
Handle<Object> value_double = factory->NewNumber(3.1415);

Handle<JSArray> array =
Expand All @@ -350,7 +337,7 @@ TEST(JSArrayAddingElementsGeneralizingiFastSmiElements) {
CHECK_EQ(0, Smi::ToInt(array->length()));

// `array[0] = smi_value` doesn't change the elements_kind
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_smi,
NONE)
.Check();
Expand All @@ -360,19 +347,19 @@ TEST(JSArrayAddingElementsGeneralizingiFastSmiElements) {
CHECK_EQ(1, Smi::ToInt(array->length()));

// `delete array[0]` does not alter length, but changes the elments_kind
name = MakeString("0");
name = CcTest::MakeString("0");
CHECK(JSReceiver::DeletePropertyOrElement(array, name).FromMaybe(false));
CHECK_NE(array->map(), *previous_map);
CHECK_EQ(HOLEY_SMI_ELEMENTS, array->map().elements_kind());
CHECK_EQ(1, Smi::ToInt(array->length()));
previous_map = handle(array->map(), isolate);

// add a couple of elements again
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_smi,
NONE)
.Check();
name = MakeString("1");
name = CcTest::MakeString("1");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_smi,
NONE)
.Check();
Expand All @@ -381,7 +368,7 @@ TEST(JSArrayAddingElementsGeneralizingiFastSmiElements) {
CHECK_EQ(2, Smi::ToInt(array->length()));

// Adding a string to the array changes from FAST_HOLEY_SMI to FAST_HOLEY
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_string,
NONE)
.Check();
Expand All @@ -391,14 +378,14 @@ TEST(JSArrayAddingElementsGeneralizingiFastSmiElements) {
previous_map = handle(array->map(), isolate);

// We don't transition back to FAST_SMI even if we remove the string
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_smi,
NONE)
.Check();
CHECK_EQ(array->map(), *previous_map);

// Adding a double doesn't change the map either
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_double,
NONE)
.Check();
Expand All @@ -414,7 +401,7 @@ TEST(JSArrayAddingElementsGeneralizingFastElements) {

Handle<String> name;
Handle<Object> value_smi(Smi::FromInt(42), isolate);
Handle<Object> value_string(MakeString("value"));
Handle<Object> value_string(CcTest::MakeString("value"));

Handle<JSArray> array =
factory->NewJSArray(ElementsKind::PACKED_ELEMENTS, 0, 0);
Expand All @@ -423,7 +410,7 @@ TEST(JSArrayAddingElementsGeneralizingFastElements) {
CHECK_EQ(0, Smi::ToInt(array->length()));

// `array[0] = smi_value` doesn't change the elements_kind
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_smi,
NONE)
.Check();
Expand All @@ -433,19 +420,19 @@ TEST(JSArrayAddingElementsGeneralizingFastElements) {
CHECK_EQ(1, Smi::ToInt(array->length()));

// `delete array[0]` does not alter length, but changes the elments_kind
name = MakeString("0");
name = CcTest::MakeString("0");
CHECK(JSReceiver::DeletePropertyOrElement(array, name).FromMaybe(false));
CHECK_NE(array->map(), *previous_map);
CHECK_EQ(HOLEY_ELEMENTS, array->map().elements_kind());
CHECK_EQ(1, Smi::ToInt(array->length()));
previous_map = handle(array->map(), isolate);

// add a couple of elements, elements_kind stays HOLEY
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_string,
NONE)
.Check();
name = MakeString("1");
name = CcTest::MakeString("1");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_smi,
NONE)
.Check();
Expand All @@ -463,15 +450,15 @@ TEST(JSArrayAddingElementsGeneralizingiFastDoubleElements) {

Handle<String> name;
Handle<Object> value_smi(Smi::FromInt(42), isolate);
Handle<Object> value_string(MakeString("value"));
Handle<Object> value_string(CcTest::MakeString("value"));
Handle<Object> value_double = factory->NewNumber(3.1415);

Handle<JSArray> array =
factory->NewJSArray(ElementsKind::PACKED_SMI_ELEMENTS, 0, 0);
Handle<Map> previous_map(array->map(), isolate);

// `array[0] = value_double` changes |elements_kind| to PACKED_DOUBLE_ELEMENTS
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_double,
NONE)
.Check();
Expand All @@ -481,7 +468,7 @@ TEST(JSArrayAddingElementsGeneralizingiFastDoubleElements) {
previous_map = handle(array->map(), isolate);

// `array[1] = value_smi` doesn't alter the |elements_kind|
name = MakeString("1");
name = CcTest::MakeString("1");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_smi,
NONE)
.Check();
Expand All @@ -490,15 +477,15 @@ TEST(JSArrayAddingElementsGeneralizingiFastDoubleElements) {
CHECK_EQ(2, Smi::ToInt(array->length()));

// `delete array[0]` does not alter length, but changes the elments_kind
name = MakeString("0");
name = CcTest::MakeString("0");
CHECK(JSReceiver::DeletePropertyOrElement(array, name).FromMaybe(false));
CHECK_NE(array->map(), *previous_map);
CHECK_EQ(HOLEY_DOUBLE_ELEMENTS, array->map().elements_kind());
CHECK_EQ(2, Smi::ToInt(array->length()));
previous_map = handle(array->map(), isolate);

// filling the hole `array[0] = value_smi` again doesn't transition back
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_double,
NONE)
.Check();
Expand All @@ -507,7 +494,7 @@ TEST(JSArrayAddingElementsGeneralizingiFastDoubleElements) {
CHECK_EQ(2, Smi::ToInt(array->length()));

// Adding a string to the array changes to elements_kind PACKED_ELEMENTS
name = MakeString("1");
name = CcTest::MakeString("1");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_string,
NONE)
.Check();
Expand All @@ -517,7 +504,7 @@ TEST(JSArrayAddingElementsGeneralizingiFastDoubleElements) {
previous_map = handle(array->map(), isolate);

// Adding a double doesn't change the map
name = MakeString("0");
name = CcTest::MakeString("0");
JSObject::DefinePropertyOrElementIgnoreAttributes(array, name, value_double,
NONE)
.Check();
Expand Down
Loading