Handle "p S::method()::static_var" in the C++ parser

[deliverable/binutils-gdb.git] / gdb / parse.c

diff --git a/gdb/parse.c b/gdb/parse.c
index 83bfa4b24138ca3533c7e9934014ae7aa50e10b5..e1fa229230c824d27901c51b93611ded51ec4d56 100644 (file)
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -901,6 +901,12 @@ operator_length_standard (const struct expression *expr, int endpos,
       oplen = 4;
       break;
 
+    case OP_FUNC_STATIC_VAR:
+      oplen = longest_to_int (expr->elts[endpos - 2].longconst);
+      oplen = 4 + BYTES_TO_EXP_ELEM (oplen + 1);
+      args = 1;
+      break;
+
     case OP_TYPE:
     case OP_BOOL:
     case OP_LAST:
@@ -950,11 +956,6 @@ operator_length_standard (const struct expression *expr, int endpos,
       args = 1;
       break;
 
-    case UNOP_MEMVAL_TLS:
-      oplen = 4;
-      args = 1;
-      break;
-
     case UNOP_ABS:
     case UNOP_CAP:
     case UNOP_CHR:
@@ -1833,11 +1834,6 @@ operator_check_standard (struct expression *exp, int pos,
       }
       break;
 
-    case UNOP_MEMVAL_TLS:
-      objfile = elts[pos + 1].objfile;
-      type = elts[pos + 2].type;
-      break;
-
     case OP_VAR_VALUE:
       {
        const struct block *const block = elts[pos + 1].block;