Commit af75f763 authored by Georg Neis's avatar Georg Neis Committed by Commit Bot

[cleanup] Use ComparisonResultToBool in more places.

R=jkummerow@chromium.org

Bug: 
Change-Id: I2aaf7160f874985374b7b975912bf93261fdef4d
Reviewed-on: https://chromium-review.googlesource.com/737831
Commit-Queue: Georg Neis <neis@chromium.org>
Reviewed-by: 's avatarJakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48958}
parent 7cd978df
...@@ -663,16 +663,10 @@ RUNTIME_FUNCTION(Runtime_StringLessThan) { ...@@ -663,16 +663,10 @@ RUNTIME_FUNCTION(Runtime_StringLessThan) {
DCHECK_EQ(2, args.length()); DCHECK_EQ(2, args.length());
CONVERT_ARG_HANDLE_CHECKED(String, x, 0); CONVERT_ARG_HANDLE_CHECKED(String, x, 0);
CONVERT_ARG_HANDLE_CHECKED(String, y, 1); CONVERT_ARG_HANDLE_CHECKED(String, y, 1);
switch (String::Compare(x, y)) { ComparisonResult result = String::Compare(x, y);
case ComparisonResult::kLessThan: DCHECK_NE(result, ComparisonResult::kUndefined);
return isolate->heap()->true_value(); return isolate->heap()->ToBoolean(
case ComparisonResult::kEqual: ComparisonResultToBool(Operation::kLessThan, result));
case ComparisonResult::kGreaterThan:
return isolate->heap()->false_value();
case ComparisonResult::kUndefined:
break;
}
UNREACHABLE();
} }
RUNTIME_FUNCTION(Runtime_StringLessThanOrEqual) { RUNTIME_FUNCTION(Runtime_StringLessThanOrEqual) {
...@@ -680,16 +674,10 @@ RUNTIME_FUNCTION(Runtime_StringLessThanOrEqual) { ...@@ -680,16 +674,10 @@ RUNTIME_FUNCTION(Runtime_StringLessThanOrEqual) {
DCHECK_EQ(2, args.length()); DCHECK_EQ(2, args.length());
CONVERT_ARG_HANDLE_CHECKED(String, x, 0); CONVERT_ARG_HANDLE_CHECKED(String, x, 0);
CONVERT_ARG_HANDLE_CHECKED(String, y, 1); CONVERT_ARG_HANDLE_CHECKED(String, y, 1);
switch (String::Compare(x, y)) { ComparisonResult result = String::Compare(x, y);
case ComparisonResult::kEqual: DCHECK_NE(result, ComparisonResult::kUndefined);
case ComparisonResult::kLessThan: return isolate->heap()->ToBoolean(
return isolate->heap()->true_value(); ComparisonResultToBool(Operation::kLessThanOrEqual, result));
case ComparisonResult::kGreaterThan:
return isolate->heap()->false_value();
case ComparisonResult::kUndefined:
break;
}
UNREACHABLE();
} }
RUNTIME_FUNCTION(Runtime_StringGreaterThan) { RUNTIME_FUNCTION(Runtime_StringGreaterThan) {
...@@ -697,16 +685,10 @@ RUNTIME_FUNCTION(Runtime_StringGreaterThan) { ...@@ -697,16 +685,10 @@ RUNTIME_FUNCTION(Runtime_StringGreaterThan) {
DCHECK_EQ(2, args.length()); DCHECK_EQ(2, args.length());
CONVERT_ARG_HANDLE_CHECKED(String, x, 0); CONVERT_ARG_HANDLE_CHECKED(String, x, 0);
CONVERT_ARG_HANDLE_CHECKED(String, y, 1); CONVERT_ARG_HANDLE_CHECKED(String, y, 1);
switch (String::Compare(x, y)) { ComparisonResult result = String::Compare(x, y);
case ComparisonResult::kGreaterThan: DCHECK_NE(result, ComparisonResult::kUndefined);
return isolate->heap()->true_value(); return isolate->heap()->ToBoolean(
case ComparisonResult::kEqual: ComparisonResultToBool(Operation::kGreaterThan, result));
case ComparisonResult::kLessThan:
return isolate->heap()->false_value();
case ComparisonResult::kUndefined:
break;
}
UNREACHABLE();
} }
RUNTIME_FUNCTION(Runtime_StringGreaterThanOrEqual) { RUNTIME_FUNCTION(Runtime_StringGreaterThanOrEqual) {
...@@ -714,16 +696,10 @@ RUNTIME_FUNCTION(Runtime_StringGreaterThanOrEqual) { ...@@ -714,16 +696,10 @@ RUNTIME_FUNCTION(Runtime_StringGreaterThanOrEqual) {
DCHECK_EQ(2, args.length()); DCHECK_EQ(2, args.length());
CONVERT_ARG_HANDLE_CHECKED(String, x, 0); CONVERT_ARG_HANDLE_CHECKED(String, x, 0);
CONVERT_ARG_HANDLE_CHECKED(String, y, 1); CONVERT_ARG_HANDLE_CHECKED(String, y, 1);
switch (String::Compare(x, y)) { ComparisonResult result = String::Compare(x, y);
case ComparisonResult::kEqual: DCHECK_NE(result, ComparisonResult::kUndefined);
case ComparisonResult::kGreaterThan: return isolate->heap()->ToBoolean(
return isolate->heap()->true_value(); ComparisonResultToBool(Operation::kGreaterThanOrEqual, result));
case ComparisonResult::kLessThan:
return isolate->heap()->false_value();
case ComparisonResult::kUndefined:
break;
}
UNREACHABLE();
} }
RUNTIME_FUNCTION(Runtime_StringEqual) { RUNTIME_FUNCTION(Runtime_StringEqual) {
......
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