x86: don't use opcode_length to identify pseudo prefixes

[deliverable/binutils-gdb.git] / gdbsupport / valid-expr.h

diff --git a/gdbsupport/valid-expr.h b/gdbsupport/valid-expr.h
index 459de179266a50c31ca149d4b9c0c68b61cc40d0..384eeea0b4919a8ec6006e9417199b6b6d597b71 100644 (file)
--- a/gdbsupport/valid-expr.h
+++ b/gdbsupport/valid-expr.h
@@ -1,6 +1,6 @@
 /* Compile-time valid expression checker for GDB, the GNU debugger.
 
-   Copyright (C) 2017-2020 Free Software Foundation, Inc.
+   Copyright (C) 2017-2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -58,10 +58,12 @@
 #define CHECK_VALID_EXPR_INT(TYPENAMES, TYPES, VALID, EXPR_TYPE, EXPR) \
   namespace CONCAT (check_valid_expr, __LINE__) {                      \
                                                                        \
-  template <TYPENAMES>                                                 \
-    using archetype = decltype (EXPR);                                 \
+  template <TYPENAMES, typename = decltype (EXPR)>                     \
+  struct archetype                                                     \
+  {                                                                    \
+  };                                                                   \
                                                                        \
-  static_assert (gdb::is_detected_exact<EXPR_TYPE,                     \
+  static_assert (gdb::is_detected_exact<archetype<TYPES, EXPR_TYPE>,   \
                 archetype, TYPES>::value == VALID,                     \
                 "");                                                   \
   } /* namespace */