Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gdb / opencl-lang.c

diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index c1ea66eea3924a9c71d38ae9fea36e1da0e75c91..e5052bbd6ceb5cc52e13219c40aba681e6511b3c 100644 (file)
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -1,5 +1,5 @@
 /* OpenCL language support for GDB, the GNU debugger.
-   Copyright (C) 2010-2019 Free Software Foundation, Inc.
+   Copyright (C) 2010-2020 Free Software Foundation, Inc.
 
    Contributed by Ken Werner <ken.werner@de.ibm.com>.
 
@@ -26,6 +26,7 @@
 #include "language.h"
 #include "varobj.h"
 #include "c-lang.h"
+#include "gdbarch.h"
 
 /* This macro generates enum values from a given type.  */
 
@@ -819,7 +820,7 @@ evaluate_subexp_opencl (struct type *expect_type, struct expression *exp,
       else
        {
          /* For scalar operations we need to avoid evaluating operands
-            unecessarily.  However, for vector operations we always need to
+            unnecessarily.  However, for vector operations we always need to
             evaluate both operands.  Unfortunately we only know which of the
             two cases apply after we know the type of the second operand.
             Therefore we evaluate it once using EVAL_AVOID_SIDE_EFFECTS.  */
@@ -1079,14 +1080,15 @@ extern const struct language_defn opencl_language_defn =
   opencl_language_arch_info,
   default_print_array_index,
   default_pass_by_reference,
-  c_get_string,
   c_watch_location_expression,
   NULL,                                /* la_get_symbol_name_matcher */
   iterate_over_symbols,
   default_search_name_hash,
   &default_varobj_ops,
   NULL,
-  NULL
+  NULL,
+  c_is_string_type_p,
+  "{...}"                      /* la_struct_too_deep_ellipsis */
 };
 
 static void *