Re-reland: Remove register index/code indirection

test/cctest/compiler/test-gap-resolver.cc

Index: test/cctest/compiler/test-gap-resolver.cc
diff --git a/test/cctest/compiler/test-gap-resolver.cc b/test/cctest/compiler/test-gap-resolver.cc
index a081ddb8fe9d79410692e8fb43413b693e1ec2a0..7dade3df33a5d821a71f6a2acab2d57e37149f1b 100644
--- a/test/cctest/compiler/test-gap-resolver.cc
+++ b/test/cctest/compiler/test-gap-resolver.cc
@@ -73,7 +73,13 @@ class InterpreterState {
     AllocatedOperand::AllocatedKind kind;
     int index;
     if (!is_constant) {
-      index = AllocatedOperand::cast(op).index();
+      if (op.IsRegister()) {
+        index = AllocatedOperand::cast(op).GetRegister().code();
+      } else if (op.IsDoubleRegister()) {
+        index = AllocatedOperand::cast(op).GetDoubleRegister().code();
+      } else {
+        index = AllocatedOperand::cast(op).index();
+      }
       kind = AllocatedOperand::cast(op).allocated_kind();
     } else {
       index = ConstantOperand::cast(op).virtual_register();
@@ -90,7 +96,9 @@ class InterpreterState {
       return ConstantOperand(key.index);
     }
     return AllocatedOperand(
-        key.kind, InstructionSequence::DefaultRepresentation(), key.index);
+        key.kind,
+        v8::internal::compiler::InstructionSequence::DefaultRepresentation(),
+        key.index);
   }
 
   friend std::ostream& operator<<(std::ostream& os,