remove equality kind from compare nil ic

src/hydrogen.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1680 matching lines @@
                                            kind));
     }
   }
 
   return object;
 }
 
 
 void HGraphBuilder::BuildCompareNil(
     HValue* value,
-    EqualityKind kind,
     CompareNilICStub::Types types,
     Handle<Map> map,
     int position,
     HIfContinuation* continuation) {
   IfBuilder if_nil(this, position);
   bool needs_or = false;
   if (types.Contains(CompareNilICStub::NULL_TYPE)) {
     if (needs_or) if_nil.Or();
     if_nil.If<HCompareObjectEqAndBranch>(value, graph()->GetConstantNull());
     needs_or = true;
@@ skipping 14 matching lines @@
     if_nil.Then();
     if_nil.Else();
     if (!map.is_null() && types.Contains(CompareNilICStub::MONOMORPHIC_MAP)) {
       BuildCheckNonSmi(value);
       // For ICs, the map checked below is a sentinel map that gets replaced by
       // the monomorphic map when the code is used as a template to generate a
       // new IC. For optimized functions, there is no sentinel map, the map
       // emitted below is the actual monomorphic map.
       BuildCheckMap(value, map);
     } else {
-      if (kind == kNonStrictEquality) {
-        if_nil.Deopt();
-      }
+      if_nil.Deopt();
     }
   }
 
   if_nil.CaptureContinuation(continuation);
 }
 
 
 HValue* HGraphBuilder::BuildCreateAllocationSiteInfo(HValue* previous_object,
                                                      int previous_object_size,
                                                      HValue* payload) {
@@ skipping 8165 matching lines @@
   }
 }
 
 
 void HOptimizedGraphBuilder::HandleLiteralCompareNil(CompareOperation* expr,
                                                      HValue* value,
                                                      NilValue nil) {
   ASSERT(!HasStackOverflow());
   ASSERT(current_block() != NULL);
   ASSERT(current_block()->HasPredecessor());
-  EqualityKind kind =
-      expr->op() == Token::EQ_STRICT ? kStrictEquality : kNonStrictEquality;
   HIfContinuation continuation;
   CompareNilICStub::Types types;
-  if (kind == kStrictEquality) {
-    types.Add((nil == kNullValue) ? CompareNilICStub::NULL_TYPE :
-                                    CompareNilICStub::UNDEFINED);
-  } else {
-    types = CompareNilICStub::Types(expr->compare_nil_types());
-    if (types.IsEmpty()) types = CompareNilICStub::Types::FullCompare();
+  if (expr->op() == Token::EQ_STRICT) {
+    IfBuilder if_nil(this);
+    if_nil.If<HCompareObjectEqAndBranch>(
+        value, (nil == kNullValue) ? graph()->GetConstantNull()
+                                   : graph()->GetConstantUndefined());
+    if_nil.Then();
+    if_nil.Else();
+    if_nil.CaptureContinuation(&continuation);
+    return ast_context()->ReturnContinuation(&continuation, expr->id());
   }
+  types = CompareNilICStub::Types(expr->compare_nil_types());
+  if (types.IsEmpty()) types = CompareNilICStub::Types::FullCompare();
   Handle<Map> map_handle = expr->map();
-  BuildCompareNil(value, kind, types, map_handle,
+  BuildCompareNil(value, types, map_handle,
                   expr->position(), &continuation);
   return ast_context()->ReturnContinuation(&continuation, expr->id());
 }
 
 
 HInstruction* HOptimizedGraphBuilder::BuildThisFunction() {
   // If we share optimized code between different closures, the
   // this-function is not a constant, except inside an inlined body.
   if (function_state()->outer() != NULL) {
       return new(zone()) HConstant(
@@ skipping 1653 matching lines @@
     }
   }
 
 #ifdef DEBUG
   if (graph_ != NULL) graph_->Verify(false);  // No full verify.
   if (allocator_ != NULL) allocator_->Verify();
 #endif
 }
 
 } }  // namespace v8::internal