diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5f9e2bc70c..fb0eea2ee8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* expop.h (class typeid_operation): New.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* expop.h (class decltype_operation): New.
diff --git a/gdb/expop.h b/gdb/expop.h
index 183137805f..804f51654b 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -1517,6 +1517,35 @@ public:
   { return OP_DECLTYPE; }
 };
 
+/* Implement 'typeid'.  */
+class typeid_operation
+  : public tuple_holding_operation<operation_up>
+{
+public:
+
+  using tuple_holding_operation::tuple_holding_operation;
+
+  value *evaluate (struct type *expect_type,
+		   struct expression *exp,
+		   enum noside noside) override
+  {
+    enum exp_opcode sub_op = std::get<0> (m_storage)->opcode ();
+    enum noside sub_noside
+      = ((sub_op == OP_TYPE || sub_op == OP_DECLTYPE || sub_op == OP_TYPEOF)
+	 ? EVAL_AVOID_SIDE_EFFECTS
+	 : noside);
+
+    value *result = std::get<0> (m_storage)->evaluate (nullptr, exp,
+						       sub_noside);
+    if (noside != EVAL_NORMAL)
+      return allocate_value (cplus_typeid_type (exp->gdbarch));
+    return cplus_typeid (result);
+  }
+
+  enum exp_opcode opcode () const override
+  { return OP_TYPEID; }
+};
+
 } /* namespace expr */
 
 #endif /* EXPOP_H */