A64: Synchronize with r16849.

src/a64/lithium-a64.h

Index: src/a64/lithium-a64.h
diff --git a/src/a64/lithium-a64.h b/src/a64/lithium-a64.h
index edb8dd372e57c78527d9f8b0c80332b2fc40a6a7..b2a15fc6d3fd1053f66329606ab46e860f731b89 100644
--- a/src/a64/lithium-a64.h
+++ b/src/a64/lithium-a64.h
@@ -113,7 +113,6 @@ class LCodeGen;
   V(Integer32ToSmi)                             \
   V(InvokeFunction)                             \
   V(IsConstructCallAndBranch)                   \
-  V(IsNumberAndBranch)                          \
   V(IsObjectAndBranch)                          \
   V(IsSmiAndBranch)                             \
   V(IsStringAndBranch)                          \
@@ -132,6 +131,7 @@ class LCodeGen;
   V(LoadKeyedGeneric)                           \
   V(LoadNamedField)                             \
   V(LoadNamedGeneric)                           \
+  V(LoadRoot)                                   \
   V(MapEnumLength)                              \
   V(MathAbs)                                    \
   V(MathAbsTagged)                              \
@@ -147,7 +147,7 @@ class LCodeGen;
   V(MathSqrt)                                   \
   V(MathTan)                                    \
   V(ModI)                                       \
-  V(MulConstIS)                                  \
+  V(MulConstIS)                                 \
   V(MulI)                                       \
   V(MulS)                                       \
   V(NumberTagD)                                 \
@@ -1110,7 +1110,7 @@ class LCmpMapAndBranch V8_FINAL : public LControlInstruction<1, 1> {
   DECLARE_CONCRETE_INSTRUCTION(CmpMapAndBranch, "cmp-map-and-branch")
   DECLARE_HYDROGEN_ACCESSOR(CompareMap)
 
-  Handle<Map> map() const { return hydrogen()->map(); }
+  Handle<Map> map() const { return hydrogen()->map().handle(); }
 };
 
 
@@ -1522,19 +1522,6 @@ class LIsConstructCallAndBranch V8_FINAL : public LControlInstruction<0, 2> {
 };
 
 
-class LIsNumberAndBranch V8_FINAL : public LControlInstruction<1, 0> {
- public:
-  explicit LIsNumberAndBranch(LOperand* value) {
-    inputs_[0] = value;
-  }
-
-  LOperand* value() { return inputs_[0]; }
-
-  DECLARE_CONCRETE_INSTRUCTION(IsNumberAndBranch, "is-number-and-branch")
-  DECLARE_HYDROGEN_ACCESSOR(IsNumberAndBranch)
-};
-
-
 class LIsObjectAndBranch V8_FINAL : public LControlInstruction<1, 2> {
  public:
   LIsObjectAndBranch(LOperand* value, LOperand* temp1, LOperand* temp2) {
@@ -1795,6 +1782,15 @@ class LLoadNamedGeneric V8_FINAL : public LTemplateInstruction<1, 1, 0> {
 };
 
 
+class LLoadRoot V8_FINAL : public LTemplateInstruction<1, 0, 0> {
+ public:
+  DECLARE_CONCRETE_INSTRUCTION(LoadRoot, "load-root")
+  DECLARE_HYDROGEN_ACCESSOR(LoadRoot)
+
+  Heap::RootListIndex index() const { return hydrogen()->index(); }
+};
+
+
 class LMapEnumLength V8_FINAL : public LTemplateInstruction<1, 1, 0> {
  public:
   explicit LMapEnumLength(LOperand* value) {