diff options
| author | Per Bothner <per@bothner.com> | 2004-09-30 16:25:27 -0700 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-09-30 16:25:27 -0700 |
| commit | cb3a14307a07a4f9d719f229caff8c47aed42624 (patch) | |
| tree | 0b4854ccef6da28990a8faf1935840149a357ba1 /gcc/java/java-tree.h | |
| parent | 6744f40032f27c47186a71c87342efbb07663f5b (diff) | |
| download | gcc-cb3a14307a07a4f9d719f229caff8c47aed42624.zip gcc-cb3a14307a07a4f9d719f229caff8c47aed42624.tar.gz gcc-cb3a14307a07a4f9d719f229caff8c47aed42624.tar.bz2 | |
java-tree.h (JAVA_FILE_P, ZIP_FILE_P): Remove unused macros.
* java-tree.h (JAVA_FILE_P, ZIP_FILE_P): Remove unused macros.
* jcf-parse.c (java_parse_file): Don't set input_filename.
Use IS_A_COMMAND_LINE_FILENAME_P to check for duplicate filenames.
Create a list of TRANSLATION_UNIT_DECL.
(current_file_list): Is now a TRANSLATION_UNIT_DECL chain. The
reason is so we can set a DECL_SOURCE_LOCATION for each file.
(java_parse_file): Don't set unused ZIP_FILE_P, JAVA_FILE_P..
Create line-map LC_ENTER/LC_LEAVE entries for archive itself.
(file_start_location): New static.
(set_source_filename): Avoid extra access to input_filename macro.
Concatenate new name with class's package prefix.
(set_source_filename, give_name_to_class): Update.
(give_name_to_class): Set class's "line 0" input_location here.
(parse_class_file): Set input_location as a unit.
* jcf-parse.c (load_class): Sanity test if missing inner class file.
From-SVN: r88366
Diffstat (limited to 'gcc/java/java-tree.h')
| -rw-r--r-- | gcc/java/java-tree.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 7ecf091..4147b29 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -52,17 +52,15 @@ struct JCF; COMPOUND_ASSIGN_P (in EXPR (binop_*)) LOCAL_CLASS_P (in RECORD_TYPE) BLOCK_IS_IMPLICIT (in BLOCK) - JAVA_FILE_P (in TREE_LIST in current_file_list) 2: RETURN_MAP_ADJUSTED (in TREE_VEC). QUALIFIED_P (in IDENTIFIER_NODE) PRIMARY_P (in EXPR_WITH_FILE_LOCATION) MODIFY_EXPR_FROM_INITIALIZATION_P (in MODIFY_EXPR) CLASS_METHOD_CHECKED_P (in RECORD_TYPE) - CLASS_FILE_P (in TREE_LIST in current_file_list) + CLASS_FILE_P (in a TRANSLATION_UNIT_DECL in current_file_list) 3: IS_AN_IMPORT_ON_DEMAND_P (in IDENTIFIER_NODE) RESOLVE_PACKAGE_NAME_P (in EXPR_WITH_FILE_LOCATION) SWITCH_HAS_DEFAULT (in SWITCH_EXPR) - ZIP_FILE_P (in TREE_LIST in current_file_list) HAS_FINALIZER (in RECORD_TYPE) 4: IS_A_COMMAND_LINE_FILENAME_P (in IDENTIFIER_NODE) RESOLVE_TYPE_NAME_P (in EXPR_WITH_FILE_LOCATION) @@ -756,7 +754,7 @@ union lang_tree_node /* Number of local variable slots needed for the arguments of this function. */ #define DECL_ARG_SLOT_COUNT(DECL) \ (DECL_LANG_SPECIFIC(DECL)->u.f.arg_slot_count) -/* Line number of end of function. */ +/* Source location of end of function. */ #define DECL_FUNCTION_LAST_LINE(DECL) (DECL_LANG_SPECIFIC(DECL)->u.f.last_line) /* Information on declaration location */ #define DECL_FUNCTION_WFL(DECL) (DECL_LANG_SPECIFIC(DECL)->u.f.wfl) @@ -958,7 +956,9 @@ struct lang_decl_func GTY(()) int max_locals; int max_stack; int arg_slot_count; - int last_line; /* End line number for a function decl */ + /* A temportary lie for the sake of ggc. Actually, last_line is + * only a source_location if USE_MAPPED_LOCATION. FIXME. */ + source_location last_line; /* End line number for a function decl */ tree wfl; /* Information on the original location */ tree throws_list; /* Exception specified by `throws' */ tree function_decl_body; /* Hold all function's statements */ @@ -1378,9 +1378,7 @@ extern tree builtin_function (const char *, tree, int, enum built_in_class, #define METHOD_INVISIBLE(DECL) \ (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (DECL))->u.f.invisible) -#define JAVA_FILE_P(NODE) TREE_LANG_FLAG_2 (NODE) #define CLASS_FILE_P(NODE) TREE_LANG_FLAG_3 (NODE) -#define ZIP_FILE_P(NODE) TREE_LANG_FLAG_4 (NODE) /* Other predicates on method decls */ |