Commit abacacdd authored by Adam Klein's avatar Adam Klein Committed by Commit Bot

Revert "[csa] add hint to CAST error message to break in mksnapshot"

This reverts commit 93b6c866.

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

Original change's description:
> [csa] add hint to CAST error message to break in mksnapshot
> 
> Change-Id: I51a22de5d6367c38056ea91eface4f69f6651993
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1664069
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Michael Stanton <mvstanton@chromium.org>
> Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#62274}

TBR=ulan@chromium.org,mvstanton@chromium.org,tebbi@chromium.org

Change-Id: I778b3a2c79776575efc8de43cf25e19ae301fca9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1667484Reviewed-by: 's avatarAdam Klein <adamk@chromium.org>
Commit-Queue: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#62295}
parent 96577220
...@@ -1206,13 +1206,6 @@ void CodeAssembler::HandleException(Node* node) { ...@@ -1206,13 +1206,6 @@ void CodeAssembler::HandleException(Node* node) {
raw_assembler()->AddNode(raw_assembler()->common()->IfSuccess(), node); raw_assembler()->AddNode(raw_assembler()->common()->IfSuccess(), node);
} }
std::string CodeAssembler::CSADebugHint() {
std::stringstream s;
s << "Run mksnapshot with --csa-trap-on-node=" << state()->name() << ","
<< state()->raw_assembler_->NodeCount() << " to break in CSA code.";
return s.str();
}
namespace { namespace {
template <size_t kMaxSize> template <size_t kMaxSize>
class NodeArray { class NodeArray {
......
...@@ -743,10 +743,7 @@ class V8_EXPORT_PRIVATE CodeAssembler { ...@@ -743,10 +743,7 @@ class V8_EXPORT_PRIVATE CodeAssembler {
code_assembler_->SmiConstant( code_assembler_->SmiConstant(
static_cast<int>(ObjectTypeOf<A>::value))), static_cast<int>(ObjectTypeOf<A>::value))),
std::make_pair(MachineType::AnyTagged(), std::make_pair(MachineType::AnyTagged(),
code_assembler_->StringConstant( code_assembler_->StringConstant(location_)));
(location_ + std::string("\n") +
code_assembler_->CSADebugHint())
.c_str())));
} }
#endif #endif
return TNode<A>::UncheckedCast(node_); return TNode<A>::UncheckedCast(node_);
...@@ -1483,8 +1480,6 @@ class V8_EXPORT_PRIVATE CodeAssembler { ...@@ -1483,8 +1480,6 @@ class V8_EXPORT_PRIVATE CodeAssembler {
void GotoIfException(Node* node, Label* if_exception, void GotoIfException(Node* node, Label* if_exception,
Variable* exception_var = nullptr); Variable* exception_var = nullptr);
std::string CSADebugHint();
// Helpers which delegate to RawMachineAssembler. // Helpers which delegate to RawMachineAssembler.
Factory* factory() const; Factory* factory() const;
Isolate* isolate() const; Isolate* isolate() const;
......
...@@ -735,8 +735,6 @@ Node* RawMachineAssembler::MakeNode(const Operator* op, int input_count, ...@@ -735,8 +735,6 @@ Node* RawMachineAssembler::MakeNode(const Operator* op, int input_count,
return graph()->NewNodeUnchecked(op, input_count, inputs); return graph()->NewNodeUnchecked(op, input_count, inputs);
} }
size_t RawMachineAssembler::NodeCount() { return graph_->NodeCount(); }
RawMachineLabel::~RawMachineLabel() { RawMachineLabel::~RawMachineLabel() {
#if DEBUG #if DEBUG
if (bound_ == used_) return; if (bound_ == used_) return;
......
...@@ -1067,8 +1067,6 @@ class V8_EXPORT_PRIVATE RawMachineAssembler { ...@@ -1067,8 +1067,6 @@ class V8_EXPORT_PRIVATE RawMachineAssembler {
return AddNode(op, sizeof...(args) + 1, buffer); return AddNode(op, sizeof...(args) + 1, buffer);
} }
size_t NodeCount();
void SetSourcePosition(const char* file, int line); void SetSourcePosition(const char* file, int line);
SourcePositionTable* source_positions() { return source_positions_; } SourcePositionTable* source_positions() { return source_positions_; }
......
...@@ -6523,9 +6523,8 @@ UNINITIALIZED_TEST(OutOfMemoryLargeObjects) { ...@@ -6523,9 +6523,8 @@ UNINITIALIZED_TEST(OutOfMemoryLargeObjects) {
} }
} }
CHECK_LE(state.old_generation_capacity_at_oom, kOldGenerationLimit); CHECK_LE(state.old_generation_capacity_at_oom, kOldGenerationLimit);
size_t size = std::max(state.old_generation_capacity_at_oom, CHECK_LE(kOldGenerationLimit, state.old_generation_capacity_at_oom +
state.memory_allocator_size_at_oom); state.new_space_capacity_at_oom +
CHECK_LE(kOldGenerationLimit, size + state.new_space_capacity_at_oom +
state.new_lo_space_size_at_oom + state.new_lo_space_size_at_oom +
FixedArray::SizeFor(kFixedArrayLength)); FixedArray::SizeFor(kFixedArrayLength));
CHECK_LE( CHECK_LE(
......
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