Merged: Squashed multiple commits.

src/deoptimizer.cc

Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 8dfe0e181c6b292bede5e1a7d8331d2ca57ac27f..0e2e2167aa405cb5e3c4d82e4486fde37e15bcc2 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -3019,10 +3019,6 @@ void TranslatedValue::MaterializeSimple() {
     }
 
     case kDouble: {
-      if (double_value().is_hole_nan()) {
-        value_ = isolate()->factory()->hole_nan_value();
-        return;
-      }
       double scalar_value = double_value().get_scalar();
       value_ = Handle<Object>(isolate()->factory()->NewNumber(scalar_value));
       return;
@@ -3907,10 +3903,10 @@ Handle<Object> TranslatedState::MaterializeCapturedObjectAt(
             Handle<FixedDoubleArray>::cast(object);
         for (int i = 0; i < length; ++i) {
           Handle<Object> value = materializer.FieldAt(value_index);
-          CHECK(value->IsNumber());
-          if (value.is_identical_to(isolate_->factory()->hole_nan_value())) {
+          if (value.is_identical_to(isolate_->factory()->the_hole_value())) {
             double_array->set_the_hole(isolate_, i);
           } else {
+            CHECK(value->IsNumber());
             double_array->set(i, value->Number());
           }
         }