Index: src/compiler/verifier.cc |
diff --git a/src/compiler/verifier.cc b/src/compiler/verifier.cc |
index 26fd6933c631acddb27311355b3317079ab05983..9480afb0e2232f5d579786c3ce5568e937fe310d 100644 |
--- a/src/compiler/verifier.cc |
+++ b/src/compiler/verifier.cc |
@@ -68,45 +68,44 @@ class Verifier::Visitor { |
void CheckNotTyped(Node* node) { |
if (NodeProperties::IsTyped(node)) { |
std::ostringstream str; |
- str << "TypeError: node #" << node->opcode() << ":" |
- << node->op()->mnemonic() << " should never have a type"; |
- V8_Fatal(__FILE__, __LINE__, str.str().c_str()); |
+ str << "TypeError: node #" << node->id() << ":" << *node->op() |
+ << " should never have a type"; |
+ FATAL(str.str().c_str()); |
} |
} |
void CheckUpperIs(Node* node, Type* type) { |
if (typing == TYPED && !bounds(node).upper->Is(type)) { |
std::ostringstream str; |
- str << "TypeError: node #" << node->opcode() << ":" |
- << node->op()->mnemonic() << " upper bound "; |
+ str << "TypeError: node #" << node->id() << ":" << *node->op() |
+ << " upper bound "; |
bounds(node).upper->PrintTo(str); |
str << " is not "; |
type->PrintTo(str); |
- V8_Fatal(__FILE__, __LINE__, str.str().c_str()); |
+ FATAL(str.str().c_str()); |
} |
} |
void CheckUpperMaybe(Node* node, Type* type) { |
if (typing == TYPED && !bounds(node).upper->Maybe(type)) { |
std::ostringstream str; |
- str << "TypeError: node #" << node->opcode() << ":" |
- << node->op()->mnemonic() << " upper bound "; |
+ str << "TypeError: node #" << node->id() << ":" << *node->op() |
+ << " upper bound "; |
bounds(node).upper->PrintTo(str); |
str << " must intersect "; |
type->PrintTo(str); |
- V8_Fatal(__FILE__, __LINE__, str.str().c_str()); |
+ FATAL(str.str().c_str()); |
} |
} |
void CheckValueInputIs(Node* node, int i, Type* type) { |
Node* input = ValueInput(node, i); |
if (typing == TYPED && !bounds(input).upper->Is(type)) { |
std::ostringstream str; |
- str << "TypeError: node #" << node->opcode() << ":" |
- << node->op()->mnemonic() << "(input @" << i << " = " |
- << input->opcode() << ":" << input->op()->mnemonic() |
- << ") upper bound "; |
+ str << "TypeError: node #" << node->id() << ":" << *node->op() |
+ << "(input @" << i << " = " << input->opcode() << ":" |
+ << input->op()->mnemonic() << ") upper bound "; |
bounds(input).upper->PrintTo(str); |
str << " is not "; |
type->PrintTo(str); |
- V8_Fatal(__FILE__, __LINE__, str.str().c_str()); |
+ FATAL(str.str().c_str()); |
} |
} |
}; |