static struct impl_files *impl_file_chain;
\f
-int interface_only; /* whether or not current file is only for
- interface definitions. */
-int interface_unknown; /* whether or not we know this class
- to behave according to #pragma interface. */
-
-\f
void
cxx_finish (void)
{
cxx_init_decl_processing ();
/* Create the built-in __null node. It is important that this is
- not shared. */
+ not shared. */
null_node = make_node (INTEGER_CST);
TREE_TYPE (null_node) = c_common_type_for_size (POINTER_SIZE, 0);
- ridpointers[RID_NULL] = null_node;
-
- interface_unknown = 1;
/* The fact that G++ uses COMDAT for many entities (inline
functions, template instantiations, virtual tables, etc.) mean
return true;
}
\f
-/* Helper function to load global variables with interface
- information. */
-
-void
-extract_interface_info (void)
-{
- struct c_fileinfo *finfo;
-
- finfo = get_fileinfo (input_filename);
- interface_only = finfo->interface_only;
- interface_unknown = finfo->interface_unknown;
-}
-
/* Return nonzero if S is not considered part of an
INTERFACE/IMPLEMENTATION pair. Otherwise, return 0. */
{
tree fname = parse_strconst_pragma ("interface", 1);
struct c_fileinfo *finfo;
- const char *main_filename;
+ const char *filename;
if (fname == (tree)-1)
return;
else if (fname == 0)
- main_filename = lbasename (input_filename);
+ filename = lbasename (input_filename);
else
- main_filename = TREE_STRING_POINTER (fname);
+ filename = ggc_strdup (TREE_STRING_POINTER (fname));
- finfo = get_fileinfo (input_filename);
+ finfo = get_fileinfo (filename);
if (impl_file_chain == 0)
{
main_input_filename = input_filename;
}
- interface_only = interface_strcmp (main_filename);
-#ifdef MULTIPLE_SYMBOL_SPACES
- if (! interface_only)
-#endif
- interface_unknown = 0;
-
- finfo->interface_only = interface_only;
- finfo->interface_unknown = interface_unknown;
+ finfo->interface_only = interface_strcmp (filename);
+ /* If MULTIPLE_SYMBOL_SPACES is set, we cannot assume that we can see
+ a definition in another file. */
+ if (!MULTIPLE_SYMBOL_SPACES || !finfo->interface_only)
+ finfo->interface_unknown = 0;
}
/* Note that we have seen a #pragma implementation for the key MAIN_FILENAME.
in older compilers and it seems reasonable to allow it in the headers
themselves, too. It only needs to precede the matching #p interface.
- We don't touch interface_only or interface_unknown; the user must specify
- a matching #p interface for this to have any effect. */
+ We don't touch finfo->interface_only or finfo->interface_unknown;
+ the user must specify a matching #p interface for this to have
+ any effect. */
static void
handle_pragma_implementation (cpp_reader* dfile ATTRIBUTE_UNUSED )
{
tree fname = parse_strconst_pragma ("implementation", 1);
- const char *main_filename;
+ const char *filename;
struct impl_files *ifiles = impl_file_chain;
if (fname == (tree)-1)
if (fname == 0)
{
if (main_input_filename)
- main_filename = main_input_filename;
+ filename = main_input_filename;
else
- main_filename = input_filename;
- main_filename = lbasename (main_filename);
+ filename = input_filename;
+ filename = lbasename (filename);
}
else
{
- main_filename = TREE_STRING_POINTER (fname);
- if (cpp_included (parse_in, main_filename))
- warning ("#pragma implementation for %s appears after file is included",
- main_filename);
+ filename = ggc_strdup (TREE_STRING_POINTER (fname));
+#if 0
+ /* We currently cannot give this diagnostic, as we reach this point
+ only after cpplib has scanned the entire translation unit, so
+ cpp_included always returns true. A plausible fix is to compare
+ the current source-location cookie with the first source-location
+ cookie (if any) of the filename, but this requires completing the
+ --enable-mapped-location project first. See PR 17577. */
+ if (cpp_included (parse_in, filename))
+ warning ("#pragma implementation for %qs appears after "
+ "file is included", filename);
+#endif
}
for (; ifiles; ifiles = ifiles->next)
{
- if (! strcmp (ifiles->filename, main_filename))
+ if (! strcmp (ifiles->filename, filename))
break;
}
if (ifiles == 0)
{
ifiles = xmalloc (sizeof (struct impl_files));
- ifiles->filename = main_filename;
+ ifiles->filename = filename;
ifiles->next = impl_file_chain;
impl_file_chain = ifiles;
}
if (IDENTIFIER_OPNAME_P (name))
{
if (name != ansi_opname (ERROR_MARK))
- error ("`%D' not defined", name);
+ error ("%qD not defined", name);
}
else
{
- error ("`%D' was not declared in this scope", name);
+ error ("%qD was not declared in this scope", name);
/* Prevent repeated error messages by creating a VAR_DECL with
this NAME in the innermost block scope. */
if (current_function_decl)
decl = build_decl (VAR_DECL, name, error_mark_node);
DECL_CONTEXT (decl) = current_function_decl;
push_local_binding (name, decl, 0);
+ /* Mark the variable as used so that we do not get warnings
+ about it being unused later. */
+ TREE_USED (decl) = 1;
}
}
Note that we have the exact wording of the following message in
the manual (trouble.texi, node "Name lookup"), so they need to
be kept in synch. */
- pedwarn ("there are no arguments to `%D' that depend on a template "
- "parameter, so a declaration of `%D' must be available",
+ pedwarn ("there are no arguments to %qD that depend on a template "
+ "parameter, so a declaration of %qD must be available",
name, name);
if (!flag_permissive)
static bool hint;
if (!hint)
{
- error ("(if you use `-fpermissive', G++ will accept your code, "
- "but allowing the use of an undeclared name is "
+ error ("(if you use %<-fpermissive%>, G++ will accept your "
+ "code, but allowing the use of an undeclared name is "
"deprecated)");
hint = true;
}
/* Set up some flags that give proper default behavior. */
if (IS_AGGR_TYPE_CODE (code))
{
- SET_CLASSTYPE_INTERFACE_UNKNOWN_X (t, interface_unknown);
- CLASSTYPE_INTERFACE_ONLY (t) = interface_only;
+ struct c_fileinfo *finfo = get_fileinfo (lbasename (input_filename));
+ SET_CLASSTYPE_INTERFACE_UNKNOWN_X (t, finfo->interface_unknown);
+ CLASSTYPE_INTERFACE_ONLY (t) = finfo->interface_only;
}
- else
- /* We use TYPE_ALIAS_SET for the CLASSTYPE_MARKED bits. But,
- TYPE_ALIAS_SET is initialized to -1 by default, so we must
- clear it here. */
- TYPE_ALIAS_SET (t) = 0;
return t;
}
return t;
}
-
-/* Return the type-qualifier corresponding to the identifier given by
- RID. */
-
-int
-cp_type_qual_from_rid (tree rid)
-{
- if (rid == ridpointers[(int) RID_CONST])
- return TYPE_QUAL_CONST;
- else if (rid == ridpointers[(int) RID_VOLATILE])
- return TYPE_QUAL_VOLATILE;
- else if (rid == ridpointers[(int) RID_RESTRICT])
- return TYPE_QUAL_RESTRICT;
-
- gcc_unreachable ();
- return TYPE_UNQUALIFIED;
-}
OSDN Git Service
