summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2015-11-10 20:04:08 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-11-10 20:04:08 +0000
commit972c5a62051ccd4558bc8956262183fe3ec466a4 (patch)
tree8d709e0ae5fa70ca607864c8ddd06a1b1c2e5aae
parent688567c06f9da553eb3c766a13a4cd32ca31ddce (diff)
parent040db345c4bcc5572b9f7dafba168f78a4e99792 (diff)
Merge "Optimizing: Clean up Equal/NotEqual constant folding for nulls."
-rw-r--r--compiler/optimizing/nodes.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 7ea6176e96..a7bd31e370 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -2692,7 +2692,7 @@ class HEqual : public HCondition {
}
HConstant* Evaluate(HNullConstant* x ATTRIBUTE_UNUSED,
HNullConstant* y ATTRIBUTE_UNUSED) const OVERRIDE {
- return GetBlock()->GetGraph()->GetConstant(GetType(), 1);
+ return GetBlock()->GetGraph()->GetIntConstant(1);
}
DECLARE_INSTRUCTION(Equal);
@@ -2728,7 +2728,7 @@ class HNotEqual : public HCondition {
}
HConstant* Evaluate(HNullConstant* x ATTRIBUTE_UNUSED,
HNullConstant* y ATTRIBUTE_UNUSED) const OVERRIDE {
- return GetBlock()->GetGraph()->GetConstant(GetType(), 0);
+ return GetBlock()->GetGraph()->GetIntConstant(0);
}
DECLARE_INSTRUCTION(NotEqual);