X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ffortran%2Ftrans.h;h=5acab12ad5a32a9d0f9d134c27b146c713cf8a88;hp=7704748d3050caf9e39b362fbb399de7ca2e68d7;hb=91c546541d44cf6b1de95dc80eb8b365519a4a68;hpb=da6ffc6d7f06a20743992bbe20e735042d059cca;ds=sidebyside diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h index 7704748d305..5acab12ad5a 100644 --- a/gcc/fortran/trans.h +++ b/gcc/fortran/trans.h @@ -1,6 +1,6 @@ /* Header for code translation functions - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software - Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. Contributed by Paul Brook This file is part of GCC. @@ -64,6 +64,13 @@ typedef struct gfc_se pointer assignments. */ unsigned direct_byref:1; + /* If direct_byref is set, do work out the descriptor as in that case but + do still create a new descriptor variable instead of using an + existing one. This is useful for special pointer assignments like + rank remapping where we have to process the descriptor before + assigning to final one. */ + unsigned byref_noassign:1; + /* Ignore absent optional arguments. Used for some intrinsics. */ unsigned ignore_optional:1; @@ -71,9 +78,16 @@ typedef struct gfc_se are NULL. Used by intrinsic size. */ unsigned data_not_needed:1; - /* If set, gfc_conv_function_call does not put byref calls into se->pre. */ + /* If set, gfc_conv_procedure_call does not put byref calls into se->pre. */ unsigned no_function_call:1; + /* If set, we will force the creation of a temporary. Useful to disable + non-copying procedure argument passing optimizations, when some function + args alias. */ + unsigned force_tmp:1; + + unsigned want_coarray:1; + /* Scalarization parameters. */ struct gfc_se *parent; struct gfc_ss *ss; @@ -82,17 +96,23 @@ typedef struct gfc_se gfc_se; -/* Scalarization State chain. Created by walking an expression tree before - creating the scalarization loops. Then passed as part of a gfc_se structure - to translate the expression inside the loop. Note that these chains are - terminated by gfc_se_terminator, not NULL. A NULL pointer in a gfc_se - indicates to gfc_conv_* that this is a scalar expression. - Note that some member arrays correspond to scalarizer rank and others - are the variable rank. */ +/* Denotes different types of coarray. + Please keep in sync with libgfortran/caf/libcaf.h. */ +typedef enum +{ + GFC_CAF_COARRAY_STATIC, + GFC_CAF_COARRAY_ALLOC, + GFC_CAF_LOCK, + GFC_CAF_LOCK_COMP +} +gfc_coarray_type; + -typedef struct gfc_ss_info +/* The array-specific scalarization informations. The array members of + this struct are indexed by actual array index, and thus can be sparse. */ + +typedef struct gfc_array_info { - int dimen; /* The ref that holds information on this section. */ gfc_ref *ref; /* The descriptor of this array. */ @@ -113,12 +133,8 @@ typedef struct gfc_ss_info tree end[GFC_MAX_DIMENSIONS]; tree stride[GFC_MAX_DIMENSIONS]; tree delta[GFC_MAX_DIMENSIONS]; - - /* Translation from scalarizer dimensions to actual dimensions. - actual = dim[scalarizer] */ - int dim[GFC_MAX_DIMENSIONS]; } -gfc_ss_info; +gfc_array_info; typedef enum { @@ -126,8 +142,9 @@ typedef enum scalarization loop. */ GFC_SS_SCALAR, - /* Like GFC_SS_SCALAR except it evaluates a pointer to the expression. - Used for elemental function parameters. */ + /* Like GFC_SS_SCALAR it evaluates the expression outside the + loop. Is always evaluated as a reference to the temporary. + Used for elemental function arguments. */ GFC_SS_REFERENCE, /* An array section. Scalarization indices will be substituted during @@ -163,8 +180,15 @@ typedef enum } gfc_ss_type; -/* SS structures can only belong to a single loopinfo. They must be added + +/* Scalarization State chain. Created by walking an expression tree before + creating the scalarization loops. Then passed as part of a gfc_se structure + to translate the expression inside the loop. Note that these chains are + terminated by gfc_ss_terminator, not NULL. A NULL pointer in a gfc_se + indicates to gfc_conv_* that this is a scalar expression. + SS structures can only belong to a single loopinfo. They must be added otherwise they will not get freed. */ + typedef struct gfc_ss { gfc_ss_type type; @@ -183,17 +207,19 @@ typedef struct gfc_ss /* GFC_SS_TEMP. */ struct { - /* The rank of the temporary. May be less than the rank of the - assigned expression. */ - int dimen; tree type; } temp; /* All other types. */ - gfc_ss_info info; + gfc_array_info info; } data; + int dimen; + /* Translation from loop dimensions to actual array dimensions. + actual_dim = dim[loop_dim] */ + int dim[GFC_MAX_DIMENSIONS]; + /* All the SS in a loop and linked through loop_chain. The SS for an expression are linked by the next pointer. */ struct gfc_ss *loop_chain; @@ -203,7 +229,7 @@ typedef struct gfc_ss loops the terms appear in. This will be 1 for the RHS expressions, 2 for the LHS expressions, and 3(=1|2) for the temporary. The bit 'where' suppresses precalculation of scalars in WHERE assignments. */ - unsigned useflags:2, where:1; + unsigned useflags:2, where:1, is_alloc_lhs:1; } gfc_ss; #define gfc_get_ss() XCNEW (gfc_ss) @@ -239,6 +265,9 @@ typedef struct gfc_loopinfo /* Order in which the dimensions should be looped, innermost first. */ int order[GFC_MAX_DIMENSIONS]; + /* Enum to control loop reversal. */ + gfc_reverse reverse[GFC_MAX_DIMENSIONS]; + /* The number of dimensions for which a temporary is used. */ int temp_dim; @@ -257,6 +286,29 @@ typedef struct gfc_saved_var; +/* Store information about a block of code together with special + initialization and clean-up code. This can be used to incrementally add + init and cleanup, and in the end put everything together to a + try-finally expression. */ +typedef struct +{ + tree init; + tree cleanup; + tree code; +} +gfc_wrapped_block; + + +/* Initialize an init/cleanup block. */ +void gfc_start_wrapped_block (gfc_wrapped_block* block, tree code); +/* Add a pair of init/cleanup code to the block. Each one might be a + NULL_TREE if not required. */ +void gfc_add_init_cleanup (gfc_wrapped_block* block, tree init, tree cleanup); +/* Finalize the block, that is, create a single expression encapsulating the + original code together with init and clean-up code. */ +tree gfc_finish_wrapped_block (gfc_wrapped_block* block); + + /* Advance the SS chain to the next term. */ void gfc_advance_se_ss_chain (gfc_se *); @@ -278,10 +330,7 @@ void gfc_make_safe_expr (gfc_se * se); void gfc_conv_string_parameter (gfc_se * se); /* Compare two strings. */ -tree gfc_build_compare_string (tree, tree, tree, tree, int); - -/* Add an item to the end of TREE_LIST. */ -tree gfc_chainon_list (tree, tree); +tree gfc_build_compare_string (tree, tree, tree, tree, int, enum tree_code); /* When using the gfc_conv_* make sure you understand what they do, i.e. when a POST chain may be created, and what the returned expression may be @@ -298,31 +347,41 @@ void gfc_conv_expr_type (gfc_se * se, gfc_expr *, tree); /* trans-expr.c */ void gfc_conv_scalar_char_value (gfc_symbol *sym, gfc_se *se, gfc_expr **expr); +tree gfc_string_to_single_character (tree len, tree str, int kind); /* Find the decl containing the auxiliary variables for assigned variables. */ void gfc_conv_label_variable (gfc_se * se, gfc_expr * expr); /* If the value is not constant, Create a temporary and copy the value. */ +tree gfc_evaluate_now_loc (location_t, tree, stmtblock_t *); tree gfc_evaluate_now (tree, stmtblock_t *); -/* Intrinsic function handling. */ +/* Find the appropriate variant of a math intrinsic. */ +tree gfc_builtin_decl_for_float_kind (enum built_in_function, int); + +/* Intrinsic procedure handling. */ +tree gfc_conv_intrinsic_subroutine (gfc_code *); void gfc_conv_intrinsic_function (gfc_se *, gfc_expr *); -/* Does an intrinsic map directly to an external library call. */ -int gfc_is_intrinsic_libcall (gfc_expr *); +/* Is the intrinsic expanded inline. */ +bool gfc_inline_intrinsic_function_p (gfc_expr *); -/* Used to call the elemental subroutines used in operator assignments. */ -tree gfc_conv_operator_assign (gfc_se *, gfc_se *, gfc_symbol *); +/* Does an intrinsic map directly to an external library call + This is true for array-returning intrinsics, unless + gfc_inline_intrinsic_function_p returns true. */ +int gfc_is_intrinsic_libcall (gfc_expr *); -/* Also used to CALL subroutines. */ -int gfc_conv_function_call (gfc_se *, gfc_symbol *, gfc_actual_arglist *, - tree); +/* Used to call ordinary functions/subroutines + and procedure pointer components. */ +int gfc_conv_procedure_call (gfc_se *, gfc_symbol *, gfc_actual_arglist *, + gfc_expr *, VEC(tree,gc) *); -void gfc_conv_subref_array_arg (gfc_se *, gfc_expr *, int, sym_intent); +void gfc_conv_subref_array_arg (gfc_se *, gfc_expr *, int, sym_intent, bool); /* gfc_trans_* shouldn't call push/poplevel, use gfc_push/pop_scope */ /* Generate code for a scalar assignment. */ -tree gfc_trans_scalar_assign (gfc_se *, gfc_se *, gfc_typespec, bool, bool); +tree gfc_trans_scalar_assign (gfc_se *, gfc_se *, gfc_typespec, bool, bool, + bool); /* Translate COMMON blocks. */ void gfc_trans_common (gfc_namespace *); @@ -340,20 +399,19 @@ tree gfc_conv_string_tmp (gfc_se *, tree, tree); /* Get the string length variable belonging to an expression. */ tree gfc_get_expr_charlen (gfc_expr *); /* Initialize a string length variable. */ -void gfc_conv_string_length (gfc_charlen *, stmtblock_t *); +void gfc_conv_string_length (gfc_charlen *, gfc_expr *, stmtblock_t *); /* Ensure type sizes can be gimplified. */ void gfc_trans_vla_type_sizes (gfc_symbol *, stmtblock_t *); /* Add an expression to the end of a block. */ void gfc_add_expr_to_block (stmtblock_t *, tree); +/* Add an expression to the beginning of a block. */ +void gfc_prepend_expr_to_block (stmtblock_t *, tree); /* Add a block to the end of a block. */ void gfc_add_block_to_block (stmtblock_t *, stmtblock_t *); -/* Add a MODIFY_EXPR or a GIMPLE_MODIFY_STMT to a block. */ -void gfc_add_modify (stmtblock_t *, tree, tree, bool); -#define gfc_add_modify_expr(BLOCK, LHS, RHS) \ - gfc_add_modify ((BLOCK), (LHS), (RHS), false) -#define gfc_add_modify_stmt(BLOCK, LHS, RHS) \ - gfc_add_modify ((BLOCK), (LHS), (RHS), true) +/* Add a MODIFY_EXPR to a block. */ +void gfc_add_modify_loc (location_t, stmtblock_t *, tree, tree); +void gfc_add_modify (stmtblock_t *, tree, tree); /* Initialize a statement block. */ void gfc_init_block (stmtblock_t *); @@ -388,9 +446,6 @@ tree gfc_build_label_decl (tree); Do not use if the function has an explicit result variable. */ tree gfc_get_fake_result_decl (gfc_symbol *, int); -/* Get the return label for the current function. */ -tree gfc_get_return_label (void); - /* Add a decl to the binding level for the current function. */ void gfc_add_decl_to_function (tree); @@ -400,14 +455,17 @@ void gfc_build_builtin_function_decls (void); /* Set the backend source location of a decl. */ void gfc_set_decl_location (tree, locus *); +/* Get a module symbol backend_decl if possible. */ +bool gfc_get_module_backend_decl (gfc_symbol *); + /* Return the variable decl for a symbol. */ tree gfc_get_symbol_decl (gfc_symbol *); /* Build a static initializer. */ -tree gfc_conv_initializer (gfc_expr *, gfc_typespec *, tree, bool, bool); +tree gfc_conv_initializer (gfc_expr *, gfc_typespec *, tree, bool, bool, bool); /* Assign a default initializer to a derived type. */ -tree gfc_init_default_dt (gfc_symbol *, tree); +void gfc_init_default_dt (gfc_symbol *, stmtblock_t *, bool); /* Substitute a temporary variable in place of the real one. */ void gfc_shadow_sym (gfc_symbol *, tree, gfc_saved_var *); @@ -415,6 +473,10 @@ void gfc_shadow_sym (gfc_symbol *, tree, gfc_saved_var *); /* Restore the original variable. */ void gfc_restore_sym (gfc_symbol *, gfc_saved_var *); +/* Setting a decl assembler name, mangling it according to target rules + (like Windows @NN decorations). */ +void gfc_set_decl_assembler_name (tree, tree); + /* Returns true if a variable of specified size should go on the stack. */ int gfc_can_put_var_on_stack (tree); @@ -425,49 +487,77 @@ void gfc_allocate_lang_decl (tree); tree gfc_advance_chain (tree, int); /* Create a decl for a function. */ -void gfc_create_function_decl (gfc_namespace *); +void gfc_create_function_decl (gfc_namespace *, bool); /* Generate the code for a function. */ void gfc_generate_function_code (gfc_namespace *); /* Output a BLOCK DATA program unit. */ void gfc_generate_block_data (gfc_namespace *); /* Output a decl for a module variable. */ void gfc_generate_module_vars (gfc_namespace *); +/* Get the appropriate return statement for a procedure. */ +tree gfc_generate_return (void); + +struct GTY(()) module_htab_entry { + const char *name; + tree namespace_decl; + htab_t GTY ((param_is (union tree_node))) decls; +}; + +struct module_htab_entry *gfc_find_module (const char *); +void gfc_module_add_decl (struct module_htab_entry *, tree); /* Get and set the current location. */ +void gfc_save_backend_locus (locus *); void gfc_set_backend_locus (locus *); -void gfc_get_backend_locus (locus *); +void gfc_restore_backend_locus (locus *); /* Handle static constructor functions. */ extern GTY(()) tree gfc_static_ctors; void gfc_generate_constructors (void); /* Get the string length of an array constructor. */ -bool get_array_ctor_strlen (stmtblock_t *, gfc_constructor *, tree *); +bool get_array_ctor_strlen (stmtblock_t *, gfc_constructor_base, tree *); + +/* Mark a condition as likely or unlikely. */ +tree gfc_likely (tree); +tree gfc_unlikely (tree); + +/* Generate a runtime error call. */ +tree gfc_trans_runtime_error (bool, locus*, const char*, ...); /* Generate a runtime warning/error check. */ void gfc_trans_runtime_check (bool, bool, tree, stmtblock_t *, locus *, const char *, ...); +/* Generate a runtime check for same string length. */ +void gfc_trans_same_strlen_check (const char*, locus*, tree, tree, + stmtblock_t*); + /* Generate a call to free() after checking that its arg is non-NULL. */ tree gfc_call_free (tree); /* Allocate memory after performing a few checks. */ tree gfc_call_malloc (stmtblock_t *, tree, tree); -/* Allocate memory for arrays, with optional status variable. */ -tree gfc_allocate_array_with_status (stmtblock_t *, tree, tree, tree); +/* Build a memcpy call. */ +tree gfc_build_memcpy_call (tree, tree, tree); + +/* Allocate memory for allocatable variables, with optional status variable. */ +void gfc_allocate_allocatable (stmtblock_t*, tree, tree, tree, + tree, tree, tree, gfc_expr*); /* Allocate memory, with optional status variable. */ -tree gfc_allocate_with_status (stmtblock_t *, tree, tree); +void gfc_allocate_using_malloc (stmtblock_t *, tree, tree, tree); /* Generate code to deallocate an array. */ -tree gfc_deallocate_with_status (tree, tree, bool); +tree gfc_deallocate_with_status (tree, tree, bool, gfc_expr*); +tree gfc_deallocate_scalar_with_status (tree, tree, bool, gfc_expr*, gfc_typespec); /* Generate code to call realloc(). */ tree gfc_call_realloc (stmtblock_t *, tree, tree); /* Generate code for an assignment, includes scalarization. */ -tree gfc_trans_assignment (gfc_expr *, gfc_expr *, bool); +tree gfc_trans_assignment (gfc_expr *, gfc_expr *, bool, bool); /* Generate code for a pointer assignment. */ tree gfc_trans_pointer_assignment (gfc_expr *, gfc_expr *); @@ -479,8 +569,16 @@ void gfc_trans_io_runtime_check (tree, tree, int, const char *, stmtblock_t *); void gfc_build_io_library_fndecls (void); /* Build a function decl for a library function. */ tree gfc_build_library_function_decl (tree, tree, int, ...); +tree gfc_build_library_function_decl_with_spec (tree name, const char *spec, + tree rettype, int nargs, ...); + +/* Process the local variable decls of a block construct. */ +void gfc_process_block_locals (gfc_namespace*); -/* somewhere! */ +/* Output initialization/clean-up code that was deferred. */ +void gfc_trans_deferred_vars (gfc_symbol*, gfc_wrapped_block *); + +/* In f95-lang.c. */ tree pushdecl (tree); tree pushdecl_top_level (tree); void pushlevel (int); @@ -488,12 +586,15 @@ tree poplevel (int, int, int); tree getdecls (void); tree gfc_truthvalue_conversion (tree); tree gfc_builtin_function (tree); + +/* In trans-types.c. */ struct array_descr_info; bool gfc_get_array_descr_info (const_tree, struct array_descr_info *); /* In trans-openmp.c */ bool gfc_omp_privatize_by_reference (const_tree); enum omp_clause_default_kind gfc_omp_predetermined_sharing (tree); +tree gfc_omp_report_decl (tree); tree gfc_omp_clause_default_ctor (tree, tree, tree); tree gfc_omp_clause_copy_ctor (tree, tree, tree); tree gfc_omp_clause_assign_op (tree, tree, tree); @@ -508,7 +609,10 @@ void gfc_omp_firstprivatize_type_sizes (struct gimplify_omp_ctx *, tree); extern GTY(()) tree gfor_fndecl_pause_numeric; extern GTY(()) tree gfor_fndecl_pause_string; extern GTY(()) tree gfor_fndecl_stop_numeric; +extern GTY(()) tree gfor_fndecl_stop_numeric_f08; extern GTY(()) tree gfor_fndecl_stop_string; +extern GTY(()) tree gfor_fndecl_error_stop_numeric; +extern GTY(()) tree gfor_fndecl_error_stop_string; extern GTY(()) tree gfor_fndecl_runtime_error; extern GTY(()) tree gfor_fndecl_runtime_error_at; extern GTY(()) tree gfor_fndecl_runtime_warning_at; @@ -523,11 +627,27 @@ extern GTY(()) tree gfor_fndecl_in_pack; extern GTY(()) tree gfor_fndecl_in_unpack; extern GTY(()) tree gfor_fndecl_associated; + +/* Coarray run-time library function decls. */ +extern GTY(()) tree gfor_fndecl_caf_init; +extern GTY(()) tree gfor_fndecl_caf_finalize; +extern GTY(()) tree gfor_fndecl_caf_register; +extern GTY(()) tree gfor_fndecl_caf_critical; +extern GTY(()) tree gfor_fndecl_caf_end_critical; +extern GTY(()) tree gfor_fndecl_caf_sync_all; +extern GTY(()) tree gfor_fndecl_caf_sync_images; +extern GTY(()) tree gfor_fndecl_caf_error_stop; +extern GTY(()) tree gfor_fndecl_caf_error_stop_str; + +/* Coarray global variables for num_images/this_image. */ +extern GTY(()) tree gfort_gvar_caf_num_images; +extern GTY(()) tree gfort_gvar_caf_this_image; + + /* Math functions. Many other math functions are handled in trans-intrinsic.c. */ -typedef struct gfc_powdecl_list GTY(()) -{ +typedef struct GTY(()) gfc_powdecl_list { tree integer; tree real; tree cmplx; @@ -587,20 +707,25 @@ extern GTY(()) tree gfor_fndecl_sr_kind; /* True if node is an integer constant. */ #define INTEGER_CST_P(node) (TREE_CODE(node) == INTEGER_CST) -/* G95-specific declaration information. */ +/* gfortran-specific declaration information, the _CONT versions denote + arrays with CONTIGUOUS attribute. */ enum gfc_array_kind { GFC_ARRAY_UNKNOWN, GFC_ARRAY_ASSUMED_SHAPE, + GFC_ARRAY_ASSUMED_SHAPE_CONT, GFC_ARRAY_ALLOCATABLE, - GFC_ARRAY_POINTER + GFC_ARRAY_POINTER, + GFC_ARRAY_POINTER_CONT }; /* Array types only. */ -struct lang_type GTY(()) -{ - int rank; +/* FIXME: the variable_size annotation here is needed because these types are + variable-sized in some other frontends. Due to gengtype deficiency the GTY + options of such types have to agree across all frontends. */ +struct GTY((variable_size)) lang_type { + int rank, corank; enum gfc_array_kind akind; tree lbound[GFC_MAX_DIMENSIONS]; tree ubound[GFC_MAX_DIMENSIONS]; @@ -609,10 +734,14 @@ struct lang_type GTY(()) tree offset; tree dtype; tree dataptr_type; + tree span; + tree base_decl[2]; + tree nonrestricted_type; + tree caf_token; + tree caf_offset; }; -struct lang_decl GTY(()) -{ +struct GTY((variable_size)) lang_decl { /* Dummy variables. */ tree saved_descriptor; /* Assigned integer nodes. Stringlength is the IO format string's length. @@ -622,12 +751,16 @@ struct lang_decl GTY(()) tree stringlen; tree addr; tree span; + /* For assumed-shape coarrays. */ + tree token, caf_offset; }; #define GFC_DECL_ASSIGN_ADDR(node) DECL_LANG_SPECIFIC(node)->addr #define GFC_DECL_STRING_LEN(node) DECL_LANG_SPECIFIC(node)->stringlen #define GFC_DECL_SPAN(node) DECL_LANG_SPECIFIC(node)->span +#define GFC_DECL_TOKEN(node) DECL_LANG_SPECIFIC(node)->token +#define GFC_DECL_CAF_OFFSET(node) DECL_LANG_SPECIFIC(node)->caf_offset #define GFC_DECL_SAVED_DESCRIPTOR(node) \ (DECL_LANG_SPECIFIC(node)->saved_descriptor) #define GFC_DECL_PACKED_ARRAY(node) DECL_LANG_FLAG_0(node) @@ -653,6 +786,9 @@ struct lang_decl GTY(()) #define GFC_TYPE_ARRAY_STRIDE(node, dim) \ (TYPE_LANG_SPECIFIC(node)->stride[dim]) #define GFC_TYPE_ARRAY_RANK(node) (TYPE_LANG_SPECIFIC(node)->rank) +#define GFC_TYPE_ARRAY_CORANK(node) (TYPE_LANG_SPECIFIC(node)->corank) +#define GFC_TYPE_ARRAY_CAF_TOKEN(node) (TYPE_LANG_SPECIFIC(node)->caf_token) +#define GFC_TYPE_ARRAY_CAF_OFFSET(node) (TYPE_LANG_SPECIFIC(node)->caf_offset) #define GFC_TYPE_ARRAY_SIZE(node) (TYPE_LANG_SPECIFIC(node)->size) #define GFC_TYPE_ARRAY_OFFSET(node) (TYPE_LANG_SPECIFIC(node)->offset) #define GFC_TYPE_ARRAY_AKIND(node) (TYPE_LANG_SPECIFIC(node)->akind) @@ -661,15 +797,21 @@ struct lang_decl GTY(()) #define GFC_TYPE_ARRAY_DTYPE(node) (TYPE_LANG_SPECIFIC(node)->dtype) #define GFC_TYPE_ARRAY_DATAPTR_TYPE(node) \ (TYPE_LANG_SPECIFIC(node)->dataptr_type) +#define GFC_TYPE_ARRAY_SPAN(node) (TYPE_LANG_SPECIFIC(node)->span) +#define GFC_TYPE_ARRAY_BASE_DECL(node, internal) \ + (TYPE_LANG_SPECIFIC(node)->base_decl[(internal)]) + /* Build an expression with void type. */ -#define build1_v(code, arg) fold_build1(code, void_type_node, arg) -#define build2_v(code, arg1, arg2) fold_build2(code, void_type_node, \ - arg1, arg2) -#define build3_v(code, arg1, arg2, arg3) fold_build3(code, void_type_node, \ - arg1, arg2, arg3) -#define build4_v(code, arg1, arg2, arg3, arg4) build4(code, void_type_node, \ - arg1, arg2, arg3, arg4) +#define build1_v(code, arg) \ + fold_build1_loc (input_location, code, void_type_node, arg) +#define build2_v(code, arg1, arg2) \ + fold_build2_loc (input_location, code, void_type_node, arg1, arg2) +#define build3_v(code, arg1, arg2, arg3) \ + fold_build3_loc (input_location, code, void_type_node, arg1, arg2, arg3) +#define build4_v(code, arg1, arg2, arg3, arg4) \ + build4_loc (input_location, code, void_type_node, arg1, arg2, \ + arg3, arg4) /* This group of functions allows a caller to evaluate an expression from the callee's interface. It establishes a mapping between the interface's @@ -743,9 +885,15 @@ void gfc_apply_interface_mapping (gfc_interface_mapping *, /* Standard error messages used in all the trans-*.c files. */ -extern const char gfc_msg_bounds[]; extern const char gfc_msg_fault[]; extern const char gfc_msg_wrong_return[]; +#define OMPWS_WORKSHARE_FLAG 1 /* Set if in a workshare construct. */ +#define OMPWS_CURR_SINGLEUNIT 2 /* Set if current gfc_code in workshare + construct is not workshared. */ +#define OMPWS_SCALARIZER_WS 4 /* Set if scalarizer should attempt + to create parallel loops. */ +#define OMPWS_NOWAIT 8 /* Use NOWAIT on OMP_FOR. */ +extern int ompws_flags; #endif /* GFC_TRANS_H */