| Index: runtime/vm/locations.cc
|
| diff --git a/runtime/vm/locations.cc b/runtime/vm/locations.cc
|
| index e751ff963cbb34cd76800b1975017f2ff9b7ed3f..265b198ff776454f23f39b9eea3c17dfe748f7db 100644
|
| --- a/runtime/vm/locations.cc
|
| +++ b/runtime/vm/locations.cc
|
| @@ -60,7 +60,7 @@ LocationSummary* LocationSummary::Make(
|
|
|
| Location Location::RegisterOrConstant(Value* value) {
|
| ConstantInstr* constant = value->definition()->AsConstant();
|
| - return ((constant != NULL) && Assembler::IsSafe(constant->value()))
|
| + return (constant != NULL)
|
| ? Location::Constant(constant->value())
|
| : Location::RequiresRegister();
|
| }
|
| @@ -68,7 +68,7 @@ Location Location::RegisterOrConstant(Value* value) {
|
|
|
| Location Location::RegisterOrSmiConstant(Value* value) {
|
| ConstantInstr* constant = value->definition()->AsConstant();
|
| - return ((constant != NULL) && Assembler::IsSafeSmi(constant->value()))
|
| + return ((constant != NULL) && constant->value().IsSmi())
|
| ? Location::Constant(constant->value())
|
| : Location::RequiresRegister();
|
| }
|
| @@ -76,7 +76,7 @@ Location Location::RegisterOrSmiConstant(Value* value) {
|
|
|
| Location Location::FixedRegisterOrConstant(Value* value, Register reg) {
|
| ConstantInstr* constant = value->definition()->AsConstant();
|
| - return ((constant != NULL) && Assembler::IsSafe(constant->value()))
|
| + return (constant != NULL)
|
| ? Location::Constant(constant->value())
|
| : Location::RegisterLocation(reg);
|
| }
|
| @@ -84,7 +84,7 @@ Location Location::FixedRegisterOrConstant(Value* value, Register reg) {
|
|
|
| Location Location::FixedRegisterOrSmiConstant(Value* value, Register reg) {
|
| ConstantInstr* constant = value->definition()->AsConstant();
|
| - return ((constant != NULL) && Assembler::IsSafeSmi(constant->value()))
|
| + return ((constant != NULL) && constant->value().IsSmi())
|
| ? Location::Constant(constant->value())
|
| : Location::RegisterLocation(reg);
|
| }
|
| @@ -92,7 +92,7 @@ Location Location::FixedRegisterOrSmiConstant(Value* value, Register reg) {
|
|
|
| Location Location::AnyOrConstant(Value* value) {
|
| ConstantInstr* constant = value->definition()->AsConstant();
|
| - return ((constant != NULL) && Assembler::IsSafe(constant->value()))
|
| + return (constant != NULL)
|
| ? Location::Constant(constant->value())
|
| : Location::Any();
|
| }
|
|
|