Merged r19440 into 3.24 branch.

src/hydrogen.h

Index: src/hydrogen.h
diff --git a/src/hydrogen.h b/src/hydrogen.h
index 7eb95e2f6acdf4a40c32b3cb8c3385634345e53b..b8344ef9c41a2be58b5eb6ad2ffef37ed7d38896 100644
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -2359,7 +2359,7 @@ class HOptimizedGraphBuilder : public HGraphBuilder, public AstVisitor {
     Handle<JSObject> holder() { return holder_; }
     Handle<JSFunction> accessor() { return accessor_; }
     Handle<Object> constant() { return constant_; }
-    Handle<Object> transition() { return transition_; }
+    Handle<Map> transition() { return handle(lookup_.GetTransitionTarget()); }
     HObjectAccess access() { return access_; }
 
    private:
@@ -2386,7 +2386,6 @@ class HOptimizedGraphBuilder : public HGraphBuilder, public AstVisitor {
     Handle<JSFunction> accessor_;
     Handle<JSObject> api_holder_;
     Handle<Object> constant_;
-    Handle<Map> transition_;
     HObjectAccess access_;
   };