Revert of [Interpreter] Map runtime id's to intrinsic id's in InvokeIntrinsic bytecode.

test/cctest/interpreter/bytecode-expectations-printer.cc

Index: test/cctest/interpreter/bytecode-expectations-printer.cc
diff --git a/test/cctest/interpreter/bytecode-expectations-printer.cc b/test/cctest/interpreter/bytecode-expectations-printer.cc
index 83f11c6d424c779a89aa25065fdb50e5aa640648..b0f623611eccd96e3d8019b01f2378e2866fe1df 100644
--- a/test/cctest/interpreter/bytecode-expectations-printer.cc
+++ b/test/cctest/interpreter/bytecode-expectations-printer.cc
@@ -19,7 +19,6 @@
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-generator.h"
 #include "src/interpreter/bytecodes.h"
-#include "src/interpreter/interpreter-intrinsics.h"
 #include "src/interpreter/interpreter.h"
 #include "src/interpreter/source-position-table.h"
 
@@ -98,6 +97,12 @@
     }
   }
 }
+
+namespace {
+i::Runtime::FunctionId IndexToFunctionId(uint32_t index) {
+  return static_cast<i::Runtime::FunctionId>(index);
+}
+}  // namespace
 
 void BytecodeExpectationsPrinter::PrintBytecodeOperand(
     std::ostream& stream, const BytecodeArrayIterator& bytecode_iterator,
@@ -159,15 +164,9 @@
         stream << bytecode_iterator.GetRegisterCountOperand(op_index);
         break;
       case OperandType::kRuntimeId: {
-        Runtime::FunctionId id =
-            bytecode_iterator.GetRuntimeIdOperand(op_index);
-        stream << "Runtime::k" << i::Runtime::FunctionForId(id)->name;
-        break;
-      }
-      case OperandType::kIntrinsicId: {
-        Runtime::FunctionId id =
-            bytecode_iterator.GetIntrinsicIdOperand(op_index);
-        stream << "Runtime::k" << i::Runtime::FunctionForId(id)->name;
+        uint32_t operand = bytecode_iterator.GetRuntimeIdOperand(op_index);
+        stream << "Runtime::k"
+               << i::Runtime::FunctionForId(IndexToFunctionId(operand))->name;
         break;
       }
       default: