GCMole issues fixes (part 2).

test/cctest/test-migrations.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 #include <utility>
 
 #include "src/v8.h"
 
 #include "src/code-stubs.h"
@@ skipping 554 matching lines @@
 
     CHECK(!new_map->is_deprecated());
     CHECK(!new_map->is_dictionary_map());
     CHECK(expectations.Check(*new_map));
   }
 
   Handle<Map> active_map = maps[kPropCount - 1];
   CHECK(!active_map->is_deprecated());
 
   // Update all deprecated maps and check that they are now the same.
-  CHECK_EQ(*active_map, *Map::Update(map));
+  Handle<Map> updated_map = Map::Update(map);
+  CHECK_EQ(*active_map, *updated_map);
   for (int i = 0; i < kPropCount; i++) {
-    Handle<Map> updated_map = Map::Update(maps[i]);
+    updated_map = Map::Update(maps[i]);
     CHECK_EQ(*active_map, *updated_map);
   }
 }
 
 
 static void TestGeneralizeRepresentationTrivial(
     Representation from_representation, Handle<HeapType> from_type,
     Representation to_representation, Handle<HeapType> to_type,
     Representation expected_representation, Handle<HeapType> expected_type,
     bool expected_field_type_dependency = true) {
@@ skipping 240 matching lines @@
 
     CHECK(!new_map->is_deprecated());
     CHECK(!new_map->is_dictionary_map());
     CHECK(expectations.Check(*new_map));
   }
 
   Handle<Map> active_map = maps[kPropCount - 1];
   CHECK(!active_map->is_deprecated());
 
   // Update all deprecated maps and check that they are now the same.
-  CHECK_EQ(*active_map, *Map::Update(map));
+  Handle<Map> updated_map = Map::Update(map);
+  CHECK_EQ(*active_map, *updated_map);
   for (int i = 0; i < kPropCount; i++) {
-    Handle<Map> updated_map = Map::Update(maps[i]);
+    updated_map = Map::Update(maps[i]);
     CHECK_EQ(*active_map, *updated_map);
   }
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // A set of tests for attribute reconfiguration case.
 //
 
 // This test ensures that representation/field type generalization is correctly
@@ skipping 698 matching lines @@
       CHECK(expectations2.Check(*new_map2));
     } else {
       CHECK(expectations.Check(*new_map2));
     }
   }
 
   Handle<Map> active_map = maps[kPropCount - 1];
   CHECK(!active_map->is_deprecated());
 
   // Update all deprecated maps and check that they are now the same.
-  CHECK_EQ(*active_map, *Map::Update(map));
+  Handle<Map> updated_map = Map::Update(map);
+  CHECK_EQ(*active_map, *updated_map);
   for (int i = 0; i < kPropCount; i++) {
-    Handle<Map> updated_map = Map::Update(maps[i]);
+    updated_map = Map::Update(maps[i]);
     CHECK_EQ(*active_map, *updated_map);
   }
 }
 
 
 TEST(ElementsKindTransitionFromMapOwningDescriptor) {
   CcTest::InitializeVM();
   v8::HandleScope scope(CcTest::isolate());
   Isolate* isolate = CcTest::i_isolate();
   Handle<HeapType> any_type = HeapType::Any(isolate);
@@ skipping 448 matching lines @@
   Handle<AccessorPair> pair = CreateAccessorPair(true, true);
   TransitionToAccessorConstantOperator transition_op(pair);
 
   SameMapChecker checker;
   TestTransitionTo(transition_op, transition_op, checker);
 }
 
 
 // TODO(ishell): add this test once IS_ACCESSOR_FIELD_SUPPORTED is supported.
 // TEST(TransitionAccessorConstantToAnotherAccessorConstant)