Skip to content

HIP ramifications: rename language_cplus to language_cplus_ #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amd-shahab wants to merge 1 commit into
base: amd-staging
Choose a base branch
from
Open

HIP ramifications: rename language_cplus to language_cplus_ #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gdb/breakpoint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3969,7 +3969,7 @@ create_std_terminate_master_breakpoint (void)
const char *const func_name = "std::terminate()";

scoped_restore_current_program_space restore_pspace;
scoped_restore_current_language save_language (language_cplus);
scoped_restore_current_language save_language (language_cplus_);

for (struct program_space *pspace : program_spaces)
{
Expand Down
2 changes: 1 addition & 1 deletion gdb/c-lang.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ class cplus_language : public language_defn
{
public:
cplus_language ()
: language_defn (language_cplus)
: language_defn (language_cplus_)
{ /* Nothing. */ }

/* See language.h. */
Expand Down
2 changes: 1 addition & 1 deletion gdb/c-typeprint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ cp_type_print_method_args (struct type *mtype,
int i;

fprintf_symbol (stream, varstring,
language_cplus, DMGL_ANSI);
language_cplus_, DMGL_ANSI);
gdb_puts ("(", stream);

int printed_args = 0;
Expand Down
4 changes: 2 additions & 2 deletions gdb/compile/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ get_language_compile_context ()
{
case language_c:
return c_get_compile_context ();
case language_cplus:
case language_cplus_:
return cplus_get_compile_context ();
default:
return {};
Expand All @@ -558,7 +558,7 @@ compute_program_language (compile_instance *inst, const char *input,
{
case language_c:
return c_compute_program (inst, input, gdbarch, block, pc);
case language_cplus:
case language_cplus_:
return cplus_compute_program (inst, input, gdbarch, block, pc);
default:
gdb_assert_not_reached ("Unsupported language");
Expand Down
2 changes: 1 addition & 1 deletion gdb/cp-namespace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ cp_lookup_symbol_imports (const char *scope,
{
struct type *context;
std::string name_copy (function->natural_name ());
const struct language_defn *lang = language_def (language_cplus);
const struct language_defn *lang = language_def (language_cplus_);
const struct block *parent = block->superblock ();
struct symbol *sym;

Expand Down
4 changes: 2 additions & 2 deletions gdb/cp-support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,7 @@ cp_symbol_name_matches_1 (const char *symbol_search_name,
while (true)
{
if (strncmp_iw_with_mode (sname, lookup_name, lookup_name_len,
mode, language_cplus, match_for_lcd, true) == 0)
mode, language_cplus_, match_for_lcd, true) == 0)
{
if (comp_match_res != NULL)
{
Expand Down Expand Up @@ -1936,7 +1936,7 @@ cp_fq_symbol_name_matches (const char *symbol_search_name,

if (strncmp_iw_with_mode (symbol_search_name,
name.c_str (), name.size (),
mode, language_cplus, match_for_lcd) == 0)
mode, language_cplus_, match_for_lcd) == 0)
{
if (comp_match_res != NULL)
comp_match_res->set_match (symbol_search_name);
Expand Down
6 changes: 3 additions & 3 deletions gdb/defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ enum language
language_c, /* C */
language_objc, /* Objective-C */
language_rust, /* Rust */
language_cplus, /* C++ */
language_cplus_, /* C++ */
language_hip, /* HIP (Heterogeneous Interface for Portability) */
language_d, /* D */
language_go, /* Go */
Expand All @@ -143,7 +143,7 @@ static_assert (nr_languages <= (1 << LANGUAGE_BITS));
static inline bool
is_cplus_dialect (enum language lang)
{
return lang == language_cplus || lang == language_hip;
return lang == language_cplus_ || lang == language_hip;
}

/* If LANG is one of C++ dialects, return "language_cplus".
Expand All @@ -152,7 +152,7 @@ is_cplus_dialect (enum language lang)
static inline enum language
strip_cplus_dialect (enum language lang)
{
return is_cplus_dialect (lang) ? language_cplus : lang;
return is_cplus_dialect (lang) ? language_cplus_ : lang;
}

/* * A generic, not quite boolean, enumeration. This is used for
Expand Down
2 changes: 1 addition & 1 deletion gdb/dwarf2/cooked-index-entry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ cooked_index_entry::full_name (struct obstack *storage,
const char *sep = default_sep;
switch (strip_cplus_dialect (lang))
{
case language_cplus:
case language_cplus_:
case language_rust:
case language_fortran:
sep = "::";
Expand Down
6 changes: 3 additions & 3 deletions gdb/dwarf2/read-gdb-index.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,13 @@ mapped_gdb_index::build_name_components (dwarf2_per_objfile *per_objfile)
if (strstr (name, "::") != nullptr)
{
components = split_name (name, split_style::CXX);
lang = language_cplus;
lang = language_cplus_;
}
else if (strchr (name, '<') != nullptr)
{
/* Guess that this is a template and so a C++ name. */
components.emplace_back (name);
lang = language_cplus;
lang = language_cplus_;
}
else if (strstr (name, "__") != nullptr)
{
Expand Down Expand Up @@ -299,7 +299,7 @@ mapped_gdb_index::build_name_components (dwarf2_per_objfile *per_objfile)
else
{
tag = DW_TAG_structure_type;
this_lang = language_cplus;
this_lang = language_cplus_;
}
break;
/* The "default" should not happen, but we mention it to
Expand Down
12 changes: 6 additions & 6 deletions gdb/dwarf2/read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13615,7 +13615,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
switch (strip_cplus_dialect (cu->lang ()))
{
case language_c:
case language_cplus:
case language_cplus_:
low.set_const_val (0);
low_default_is_valid = 1;
break;
Expand Down Expand Up @@ -14049,7 +14049,7 @@ cooked_index_functions::search
/* No splitting is also a style. */
language_c,
/* This includes Rust. */
language_cplus,
language_cplus_,
/* This includes Go. */
language_d,
language_ada
Expand All @@ -14068,9 +14068,9 @@ cooked_index_functions::search

switch (strip_cplus_dialect (lang))
{
case language_cplus:
case language_cplus_:
case language_rust:
unique_styles_used[language_cplus] = true;
unique_styles_used[language_cplus_] = true;
break;
case language_d:
case language_go:
Expand Down Expand Up @@ -15075,7 +15075,7 @@ dwarf_lang_to_enum_language (ULONGEST lang)
case DW_LANG_C_plus_plus_17:
case DW_LANG_C_plus_plus_20:
case DW_LANG_C_plus_plus_23:
language = language_cplus;
language = language_cplus_;
break;
case DW_LANG_D:
language = language_d;
Expand Down Expand Up @@ -18249,7 +18249,7 @@ cutu_reader::prepare_one_comp_unit (struct dwarf2_cu *cu,
with a "set language hip" command in GDB itself. Still, this
workaround works better than checking the "producer", since
various providers tend to name them slightly differently. */
if (lang == language_cplus
if (lang == language_cplus_
&& (cu->per_objfile->per_bfd->obfd->arch_info->arch
== bfd_arch_amdgcn))
{
Expand Down
2 changes: 1 addition & 1 deletion gdb/eval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ binop_promote (const struct language_defn *language, struct gdbarch *gdbarch,
switch (strip_cplus_dialect (language->la_language))
{
case language_c:
case language_cplus:
case language_cplus_:
case language_asm:
case language_objc:
case language_opencl:
Expand Down
2 changes: 1 addition & 1 deletion gdb/source-cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ get_language_name (enum language lang)
case language_objc:
return "c.lang";

case language_cplus:
case language_cplus_:
return "cpp.lang";

case language_d:
Expand Down
4 changes: 2 additions & 2 deletions gdb/symtab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ general_symbol_info::natural_name () const
{
switch (strip_cplus_dialect (language ()))
{
case language_cplus:
case language_cplus_:
case language_d:
case language_go:
case language_objc:
Expand All @@ -1078,7 +1078,7 @@ general_symbol_info::demangled_name () const

switch (strip_cplus_dialect (language ()))
{
case language_cplus:
case language_cplus_:
case language_d:
case language_go:
case language_objc:
Expand Down
6 changes: 3 additions & 3 deletions gdb/symtab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class lookup_name_info final
{
case language_ada:
return ada ().lookup_name ().c_str ();
case language_cplus:
case language_cplus_:
return cplus ().lookup_name ().c_str ();
case language_d:
return d ().lookup_name ().c_str ();
Expand All @@ -295,7 +295,7 @@ class lookup_name_info final
split_style style = split_style::NONE;
switch (strip_cplus_dialect (lang))
{
case language_cplus:
case language_cplus_:
case language_rust:
style = split_style::CXX;
break;
Expand All @@ -317,7 +317,7 @@ class lookup_name_info final
/* Get the C++-specific lookup info. */
const demangle_for_lookup_info &cplus () const
{
maybe_init (m_cplus, language_cplus);
maybe_init (m_cplus, language_cplus_);
return *m_cplus;
}

Expand Down
2 changes: 1 addition & 1 deletion gdb/unittests/lookup_name_info-selftests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ run_tests ()
"Foozle<int>::fogey<Empty<int> >");
};

check_cpp_dialect (language_cplus);
check_cpp_dialect (language_cplus_);
check_cpp_dialect (language_hip);

#undef CHECK
Expand Down
4 changes: 2 additions & 2 deletions gdb/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2812,7 +2812,7 @@ strncmp_iw_with_mode_tests ()

/* Test scope operator. */
check_scope_operator (language_minimal);
check_scope_operator (language_cplus);
check_scope_operator (language_cplus_);
check_scope_operator (language_fortran);
check_scope_operator (language_rust);

Expand Down Expand Up @@ -2856,7 +2856,7 @@ strncmp_iw_with_mode_tests ()
#undef MATCH
};

user_def_ops_test (language_cplus);
user_def_ops_test (language_cplus_);
user_def_ops_test (language_hip);

/* Skip "[abi:cxx11]" tags in the symbol name if the lookup name
Expand Down
Loading