Commit ff8f5fd7 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

Revert "[heap] Add tests to CodeBuilder Build and TryBuild"

This reverts commit 29809611.

Reason for revert:
https://ci.chromium.org/p/v8/builders/ci/V8%20Linux%20-%20nosnap%20-%20debug/23930

Original change's description:
> [heap] Add tests to CodeBuilder Build and TryBuild
> 
> Bug: chromium:957934
> Change-Id: Ia1ce5f6150b7f862b38f4c135236b154a1b02d6c
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1594564
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Commit-Queue: Maciej Goszczycki <goszczycki@google.com>
> Cr-Commit-Position: refs/heads/master@{#61391}

TBR=ulan@chromium.org,delphick@chromium.org,goszczycki@google.com

Change-Id: I036f66115d9d00f6bbccc36a2c04cb087a94c447
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:957934
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1605721Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61399}
parent af026355
...@@ -13,45 +13,11 @@ namespace v8 { ...@@ -13,45 +13,11 @@ namespace v8 {
namespace internal { namespace internal {
namespace test_factory { namespace test_factory {
namespace {
constexpr int kInstructionSize = 10 * MB;
size_t NearHeapLimitCallback(void* raw_bool, size_t current_heap_limit,
size_t initial_heap_limit) {
bool* oom_triggered = static_cast<bool*>(raw_bool);
*oom_triggered = true;
return kInstructionSize * 2;
}
class SetupIsolateWithSmallHeap {
public:
SetupIsolateWithSmallHeap() {
FLAG_max_old_space_size = kInstructionSize / MB / 2; // In MB.
v8::Isolate::CreateParams create_params;
create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
isolate_ = reinterpret_cast<Isolate*>(v8::Isolate::New(create_params));
isolate_->heap()->AddNearHeapLimitCallback(NearHeapLimitCallback,
&oom_triggered_);
}
~SetupIsolateWithSmallHeap() {
reinterpret_cast<v8::Isolate*>(isolate_)->Dispose();
}
Isolate* isolate() { return isolate_; }
bool oom_triggered() const { return oom_triggered_; }
private:
Isolate* isolate_;
bool oom_triggered_ = false;
};
} // namespace
TEST(Factory_CodeBuilder) { TEST(Factory_CodeBuilder) {
Isolate* isolate = CcTest::i_isolate(); LocalContext env;
HandleScope scope(isolate); v8::Isolate* isolate = env->GetIsolate();
Isolate* i_isolate = reinterpret_cast<Isolate*>(isolate);
HandleScope scope(i_isolate);
// Create a big function that ends up in CODE_LO_SPACE. // Create a big function that ends up in CODE_LO_SPACE.
const int instruction_size = kMaxRegularHeapObjectSize + 1; const int instruction_size = kMaxRegularHeapObjectSize + 1;
...@@ -67,46 +33,14 @@ TEST(Factory_CodeBuilder) { ...@@ -67,46 +33,14 @@ TEST(Factory_CodeBuilder) {
desc.unwinding_info_size = 0; desc.unwinding_info_size = 0;
desc.origin = nullptr; desc.origin = nullptr;
Handle<Code> code = Handle<Code> code =
Factory::CodeBuilder(isolate, desc, Code::WASM_FUNCTION).Build(); Factory::CodeBuilder(i_isolate, desc, Code::WASM_FUNCTION).Build();
CHECK(isolate->heap()->InSpace(*code, CODE_LO_SPACE)); CHECK(i_isolate->heap()->InSpace(*code, CODE_LO_SPACE));
#if VERIFY_HEAP #if VERIFY_HEAP
code->ObjectVerify(isolate); code->ObjectVerify(i_isolate);
#endif #endif
} }
UNINITIALIZED_TEST(Factory_CodeBuilder_BuildOOM) {
SetupIsolateWithSmallHeap isolate_scope;
HandleScope scope(isolate_scope.isolate());
std::unique_ptr<byte[]> instructions(new byte[kInstructionSize]);
CodeDesc desc;
desc.instr_size = kInstructionSize;
desc.buffer = instructions.get();
const Handle<Code> code =
Factory::CodeBuilder(isolate_scope.isolate(), desc, Code::WASM_FUNCTION)
.Build();
CHECK(!code.is_null());
CHECK(isolate_scope.oom_triggered());
}
UNINITIALIZED_TEST(Factory_CodeBuilder_TryBuildOOM) {
SetupIsolateWithSmallHeap isolate_scope;
HandleScope scope(isolate_scope.isolate());
std::unique_ptr<byte[]> instructions(new byte[kInstructionSize]);
CodeDesc desc;
desc.instr_size = kInstructionSize;
desc.buffer = instructions.get();
const MaybeHandle<Code> code =
Factory::CodeBuilder(isolate_scope.isolate(), desc, Code::WASM_FUNCTION)
.TryBuild();
CHECK(code.is_null());
CHECK(!isolate_scope.oom_triggered());
}
} // namespace test_factory } // namespace test_factory
} // namespace internal } // namespace internal
} // namespace v8 } // namespace v8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment