Adding template parameter to PrototypeIterator GetCurrent for casting

src/hydrogen.cc

Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index bf55f7ca66e3eb65845a852d565769716950c53a..664abf8c9c8515528a044e3f8522b90b6384d583 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -7351,7 +7351,7 @@ HInstruction* HOptimizedGraphBuilder::BuildMonomorphicElementAccess(
     PrototypeIterator iter(map);
     JSObject* holder = NULL;
     while (!iter.IsAtEnd()) {
-      holder = JSObject::cast(*PrototypeIterator::GetCurrent(iter));
+      holder = iter.GetCurrent<JSObject>();

[Jakob Kummerow, 2015/09/09 14:29:55]

I think you need to keep the '*' -- when a PrototypeIterator was constructed for
a Handle, it'll return Handles.

[Camillo Bruni, 2015/09/09 17:24:07]

PrototypeIterator::GetCurrent and ->/.GetCurrent are not the same thing
(contrary to what the name suggests), the first one returns a Handle while the
second one returns the raw Object* (quite confusing... should probably change
the name to GetRaw)

[Camillo Bruni, 2015/09/10 10:53:59]

reverted

       iter.Advance();
     }
     DCHECK(holder && holder->IsJSObject());
@@ -7880,15 +7880,13 @@ HInstruction* HGraphBuilder::BuildCheckPrototypeMaps(Handle<JSObject> prototype,
                          PrototypeIterator::START_AT_RECEIVER);
   while (holder.is_null() ||
          !PrototypeIterator::GetCurrent(iter).is_identical_to(holder)) {
-    BuildConstantMapCheck(
-        Handle<JSObject>::cast(PrototypeIterator::GetCurrent(iter)));
+    BuildConstantMapCheck(PrototypeIterator::GetCurrent<JSObject>(iter));
     iter.Advance();
     if (iter.IsAtEnd()) {
       return NULL;
     }
   }
-  return BuildConstantMapCheck(
-      Handle<JSObject>::cast(PrototypeIterator::GetCurrent(iter)));
+  return BuildConstantMapCheck(PrototypeIterator::GetCurrent<JSObject>(iter));
 }