From 51b0257d01c73b1e58be3cc803ad04ef7625c12c Mon Sep 17 00:00:00 2001 From: gfunck Date: Sat, 30 Apr 2011 03:38:23 +0000 Subject: [PATCH] 2011-04-29 Gary Funck gcc/ * c-decl.c (finish_decl): Improve error diagnostics. (grokdeclarator): Ditto. * c-typeck.c (build_c_cast): Improve error diagnostics. (convert_for_assignment): Ditto. (build_binary_op): Ditto. * c-parser.c (c_parser_upc_forall_statement): Improve error diagnostics. * convert.c (convert_to_integer): Improve error diagnostics. gcc/upc/ * upc-gimplify.c (upc_expsnd_get): Improve error diagnostics. (upc_expand_put): Ditto. (upc_shared_addr): Ditto. (upc_gimplify_sync_stmt): Ditto. (upc_gimplify_field_ref): Ditto. * upc-pts-struct.c (upc_pts_build_diff): Improve error diagnostics. (upc_pts_build_cvt): Ditto. * upc-act.c (upc_handle_option): Improve error diagnostics. (upc_lang_init): Ditto. (upc_sizeof_type_check): Ditto. (upc_set_block_factor): Ditto. (upc_decl_init): Ditto. (upc_affinity_test): Ditto. (upc_num_threads): Ditto. (upc_diagnose_deprecated_stmt): Ditto. (upc_build_shared_var_addr): Ditto. (upc_pts_int_sum): Ditto. (upc_pts_diff): Ditto. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gupc@173205 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.upc | 14 +++++++++++ gcc/c-decl.c | 47 ++++++++++++++++++----------------- gcc/c-parser.c | 6 ++--- gcc/c-typeck.c | 38 ++++++++++++++-------------- gcc/convert.c | 2 +- gcc/upc/ChangeLog | 24 ++++++++++++++++++ gcc/upc/upc-act.c | 64 +++++++++++++++++++++++++----------------------- gcc/upc/upc-gimplify.c | 14 ++++++----- gcc/upc/upc-pts-struct.c | 4 +-- 9 files changed, 128 insertions(+), 85 deletions(-) diff --git a/gcc/ChangeLog.upc b/gcc/ChangeLog.upc index 2899cdbb978..f8a649a0eb1 100644 --- a/gcc/ChangeLog.upc +++ b/gcc/ChangeLog.upc @@ -1,3 +1,17 @@ +2011-04-29 Gary Funck + + * c-decl.c (finish_decl): Improve error diagnostics. + (grokdeclarator): Ditto. + + * c-typeck.c (build_c_cast): Improve error diagnostics. + (convert_for_assignment): Ditto. + (build_binary_op): Ditto. + + * c-parser.c (c_parser_upc_forall_statement): + Improve error diagnostics. + + * convert.c (convert_to_integer): Improve error diagnostics. + 2011-04-24 Gary Funck * c-parser.c (c_parser_upc_sync_statement): Fix ICE that diff --git a/gcc/c-decl.c b/gcc/c-decl.c index f76bc55e0a9..ef76f01e8e6 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -4318,15 +4318,15 @@ finish_decl (tree decl, location_t init_loc, tree init, { gcc_assert (!flag_upc_threads); if (UPC_TYPE_HAS_THREADS_FACTOR (TREE_TYPE (decl))) - error ("In the dynamic translation environment, THREADS may" - " not appear in declarations of shared arrays" - " with indefinite block size." - " The storage size of %q+D cannot be calculated.", decl); + error ("in the UPC dynamic translation environment, THREADS may " + "not appear in declarations of shared arrays " + "with indefinite block size; " + "the storage size of %q+D cannot be calculated", decl); else - error ("In the dynamic translation environment," - " THREADS must appear exactly once in" - " declarations of shared arrays." - " The storage size of %q+D cannot be calculated.", decl); + error ("in the UPC dynamic translation environment, " + "THREADS must appear exactly once in " + "declarations of shared arrays; " + "the storage size of %q+D cannot be calculated", decl); } else error ("storage size of %q+D isn%'t constant", decl); @@ -5084,8 +5084,8 @@ grokdeclarator (const struct c_declarator *declarator, const tree b2 = upc_get_block_factor (t); if (!tree_int_cst_equal (b1, b2)) { - error_at (loc, "UPC layout qualifier is incompatible with" - " the type specified by a typedef"); + error_at (loc, "UPC layout qualifier is incompatible with " + "the type specified by a typedef"); layout_qualifier = NULL_TREE; } } @@ -5111,11 +5111,12 @@ grokdeclarator (const struct c_declarator *declarator, pedwarn (loc, OPT_pedantic, "duplicate %"); } if (strictp && relaxedp) - error_at (loc, "%qE is declared both strict and relaxed.", name); + error_at (loc, "UPC shared variable %qE is declared " + "both strict and relaxed", name); if (strictp && !sharedp) - error_at (loc, "%qE is declared strict but not shared.", name); + error_at (loc, "%qE is declared with UPC strict qualifier but not shared", name); if (relaxedp && !sharedp) - error_at (loc, "%qE is declared relaxed but not shared.", name); + error_at (loc, "%qE is declared with UPC relaxed qualifier but not shared", name); if (!ADDR_SPACE_GENERIC_P (as1) && !ADDR_SPACE_GENERIC_P (as2) && as1 != as2) error_at (loc, "conflicting named address spaces (%s vs %s)", @@ -5418,16 +5419,16 @@ grokdeclarator (const struct c_declarator *declarator, int n_thread_refs = count_upc_threads_refs (size); if (upc_threads_ref || n_thread_refs > 1) { - error_at (loc, "THREADS may not be referenced more than once" - " in a shared array declaration." - " The size of %qE cannot be calculated.", name); + error_at (loc, "UPC shared array declaration references THREADS " + "more than once; the size of %qE " + "cannot be calculated", name); size = integer_one_node; } else if (!is_multiple_of_upc_threads (size)) { - error_at (loc, "Array dimension is not a simple multiple" - " of THREADS.", - " The size of %qE cannot be calculated.", name); + error_at (loc, "UPC shared array dimension is not a simple multiple " + "of THREADS; the size of %qE " + "cannot be calculated.", name); size = integer_one_node; } else @@ -5725,7 +5726,7 @@ grokdeclarator (const struct c_declarator *declarator, "function definition has qualified void return type"); else if (type_quals & TYPE_QUAL_SHARED) { - error_at (loc, "function definition has shared qualified return type"); + error_at (loc, "function definition has UPC shared qualified return type"); type_quals &= ~(TYPE_QUAL_SHARED | TYPE_QUAL_STRICT | TYPE_QUAL_RELAXED); } @@ -6039,7 +6040,7 @@ grokdeclarator (const struct c_declarator *declarator, } else if (type_quals & TYPE_QUAL_SHARED) { - error ("parameter declared with shared qualifier"); + error ("parameter declared with UPC shared qualifier"); type_quals &= ~(TYPE_QUAL_SHARED | TYPE_QUAL_STRICT | TYPE_QUAL_RELAXED); } @@ -6090,7 +6091,7 @@ grokdeclarator (const struct c_declarator *declarator, } else if (type_quals & TYPE_QUAL_SHARED) { - error_at (loc, "field %qE declared with shared qualifier", + error_at (loc, "field %qE declared with UPC shared qualifier", name); type_quals &= ~(TYPE_QUAL_SHARED | TYPE_QUAL_STRICT | TYPE_QUAL_RELAXED); @@ -6190,7 +6191,7 @@ grokdeclarator (const struct c_declarator *declarator, && !((current_scope == file_scope) || (storage_class == csc_static))) { - error_at (loc, "UPC does not support shared auto variables."); + error_at (loc, "UPC does not support shared auto variables"); } type = c_build_qualified_type (type, type_quals); diff --git a/gcc/c-parser.c b/gcc/c-parser.c index 72af001c20b..dde8f67dd07 100644 --- a/gcc/c-parser.c +++ b/gcc/c-parser.c @@ -8426,9 +8426,9 @@ c_parser_upc_forall_statement (c_parser *parser) tree upc_forall_depth, depth_gt_one; upc_forall_depth = lookup_name (get_identifier (UPC_FORALL_DEPTH_NAME)); if (upc_forall_depth == NULL_TREE) - internal_error ("Cannot locate '" UPC_FORALL_DEPTH_NAME "'." - " This identifier should be defined in a compiler-supplied" - " include file."); + internal_error ("the UPC runtime variable '" UPC_FORALL_DEPTH_NAME "' " + "cannot be located; this variable should be defined " + "in a compiler-supplied include file"); assemble_external (upc_forall_depth); TREE_USED (upc_forall_depth) = 1; c_finish_expr_stmt (loc, diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 3606a59d2af..f9e49df12d6 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -4818,7 +4818,7 @@ build_c_cast (location_t loc, tree type, tree expr) && POINTER_TYPE_P (otype) && !upc_shared_type_p (TREE_TYPE (otype))) { - error ("UPC does not allow casts from a local pointer to a pointer-to-shared."); + error ("UPC does not allow casts from a local pointer to a pointer-to-shared"); return error_mark_node; } @@ -5664,8 +5664,8 @@ convert_for_assignment (location_t location, tree type, tree rhs, if ((upc_shared_type_p (ttl) && !upc_shared_type_p (ttr)) && !integer_zerop (rhs)) { - error_at (location, "UPC does not allow assignments from a local pointer" - " to pointer-to-shared."); + error_at (location, "UPC does not allow assignments from a local pointer " + "to a pointer-to-shared"); return error_mark_node; } if (!upc_shared_type_p (ttl) && upc_shared_type_p (ttr)) @@ -5676,8 +5676,8 @@ convert_for_assignment (location_t location, tree type, tree rhs, } else { - error_at (location, "UPC does not allow assignments" - " from shared to local pointers."); + error_at (location, "UPC does not allow assignments " + "from a pointer-to-shared to a local pointer"); return error_mark_node; } } @@ -5691,9 +5691,9 @@ convert_for_assignment (location_t location, tree type, tree rhs, UPC dictates that their blocking factors must be equal. */ if (!tree_int_cst_equal (bs_l, bs_r)) { - error_at (location, "UPC does not allow assignment" - " between pointers to shared with" - " differing block sizes without a cast"); + error_at (location, "UPC does not allow assignment " + "between pointers to shared with " + "differing block sizes without a cast"); return error_mark_node; } } @@ -5908,12 +5908,12 @@ convert_for_assignment (location_t location, tree type, tree rhs, if (upc_shared_type_p (TREE_TYPE (type))) ERROR_FOR_ASSIGNMENT (location, 0, G_("passing argument %d of %qE attempts to make " - "a pointer-to-shared from an integer"), - G_("assignment attempts to make a pointer-to-shared " - "from an integer"), - G_("initialization attempts to make a pointer-to-shared " - "from an integer without a cast"), - G_("return makes a pointer-to-shared from an " + "a UPC pointer-to-shared value from an integer"), + G_("assignment attempts to make a UPC pointer-to-shared " + "value from an integer"), + G_("initialization attempts to make a UPC pointer-to-shared " + "value from an integer without a cast"), + G_("return makes a UPC pointer-to-shared value from an " "integer")); else WARN_FOR_ASSIGNMENT (location, 0, @@ -10150,9 +10150,9 @@ build_binary_op (location_t location, enum tree_code code, || (upc_shared_type_p (tt1) && !(upc_shared_type_p (tt0) || integer_zerop(op0)))) { - error_at (location, "UPC does not allow comparisons" - " between pointers to shared and" - " local pointers"); + error_at (location, "UPC does not allow comparisons " + "between pointers to shared and " + "local pointers"); return error_mark_node; } /* Anything compares with void *. void * compares with anything. @@ -10231,8 +10231,8 @@ build_binary_op (location_t location, enum tree_code code, if (upc_shared_type_p (tt0) != upc_shared_type_p (tt1)) { - error_at (location, "UPC does not allow comparisons between" - " pointers to shared and local pointers"); + error_at (location, "UPC does not allow comparisons between " + "pointers to shared and local pointers"); return error_mark_node; } if (comp_target_types (location, type0, type1)) diff --git a/gcc/convert.c b/gcc/convert.c index 1758fb83f89..521c3e7ec17 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -556,7 +556,7 @@ convert_to_integer (tree type, tree expr) case REFERENCE_TYPE: if (upc_shared_type_p (TREE_TYPE (intype))) { - error ("invalid conversion from shared pointer to integer"); + error ("invalid conversion from a UPC pointer-to-shared to an integer"); expr = integer_zero_node; } if (integer_zerop (expr)) diff --git a/gcc/upc/ChangeLog b/gcc/upc/ChangeLog index b5e146f6f4e..6cd74d1af1d 100644 --- a/gcc/upc/ChangeLog +++ b/gcc/upc/ChangeLog @@ -1,3 +1,27 @@ +2011-04-29 Gary Funck + + * upc-gimplify.c (upc_expsnd_get): Improve error diagnostics. + (upc_expand_put): Ditto. + (upc_shared_addr): Ditto. + (upc_gimplify_sync_stmt): Ditto. + (upc_gimplify_field_ref): Ditto. + + * upc-pts-struct.c (upc_pts_build_diff): Improve error diagnostics. + (upc_pts_build_cvt): Ditto. + + * upc-act.c (upc_handle_option): Improve error diagnostics. + (upc_lang_init): Ditto. + (upc_sizeof_type_check): Ditto. + (upc_set_block_factor): Ditto. + (upc_decl_init): Ditto. + (upc_affinity_test): Ditto. + (upc_num_threads): Ditto. + (upc_diagnose_deprecated_stmt): Ditto. + (upc_build_shared_var_addr): Ditto. + (upc_pts_int_sum): Ditto. + (upc_pts_diff): Ditto. + + 2011-04-28 Gary Funck * upc-act.c (create_unshared_var): call upc_get_unshared_type() diff --git a/gcc/upc/upc-act.c b/gcc/upc/upc-act.c index 5936617d2bf..db6537fe6ff 100644 --- a/gcc/upc/upc-act.c +++ b/gcc/upc/upc-act.c @@ -137,7 +137,7 @@ upc_handle_option (size_t scode, const char *arg, int value, int kind, case OPT_fupc_pthreads_per_process_: if (value > UPC_MAX_THREADS) { - error ("THREADS value exceeds implementation limit of %d", + error ("THREADS value exceeds UPC implementation limit of %d", UPC_MAX_THREADS); value = 1; } @@ -146,7 +146,7 @@ upc_handle_option (size_t scode, const char *arg, int value, int kind, case OPT_fupc_threads_: if (value > UPC_MAX_THREADS) { - error ("THREADS value exceeds implementation limit of %d", + error ("THREADS value exceeds UPC implementation limit of %d", UPC_MAX_THREADS); value = 1; } @@ -164,7 +164,8 @@ upc_lang_init (void) { if (!targetm.have_named_sections) { - fatal_error ("UPC is not implemented on this target. The target linker does not support separately linked sections."); + fatal_error ("UPC is not implemented on this target; " + "the target linker does not support separately linked sections"); } /* c_obj_common_init is also called from regular 'C' It will return 'false' if we're pre-processing only. */ @@ -305,17 +306,17 @@ upc_sizeof_type_check (const char *op_name, tree type) } else if (code == FUNCTION_TYPE) { - error ("%s applied to a function type", op_name); + error ("UPC operator %s applied to a function type", op_name); return 0; } else if (code == VOID_TYPE) { - error ("%s applied to a void type", op_name); + error ("UPC operator %s applied to a void type", op_name); return 0; } else if (!upc_shared_type_p (type)) { - error ("%s applied to a non-shared type", op_name); + error ("UPC operator %s applied to a non-shared type", op_name); return 0; } return 1; @@ -674,7 +675,7 @@ upc_set_block_factor (const enum tree_code decl_kind, if (TREE_CODE (type) == VOID_TYPE) { - error ("layout qualifier cannot be applied to a void type"); + error ("UPC layout qualifier cannot be applied to a void type"); return type; } @@ -696,12 +697,12 @@ upc_set_block_factor (const enum tree_code decl_kind, /* layout qualifier is [*] */ if (!COMPLETE_TYPE_P (type)) { - error ("layout qualifier of the form [*] cannot be applied to an incomplete type"); + error ("UPC layout qualifier of the form [*] cannot be applied to an incomplete type"); return type; } if (decl_kind == POINTER_TYPE) { - error ("[*] qualifier may not be used in declaration of pointers"); + error ("UPC [*] qualifier may not be used in declaration of pointers"); return type; } /* The blocking factor is given by this expression: @@ -716,9 +717,9 @@ upc_set_block_factor (const enum tree_code decl_kind, n_threads = convert (bitsizetype, upc_num_threads ()); if (TREE_CODE (n_threads) != INTEGER_CST) { - error ("A layout qualifier of '[*]' requires that" - " the array size is either an integral constant" - " or an integral multiple of THREADS."); + error ("A UPC layout qualifier of '[*]' requires that " + "the array size is either an integral constant " + "or an integral multiple of THREADS"); block_factor = size_one_node; } else @@ -733,7 +734,7 @@ upc_set_block_factor (const enum tree_code decl_kind, { STRIP_NOPS (layout_qualifier); if (TREE_CODE (layout_qualifier) != INTEGER_CST) - error ("layout qualifier is not an integral constant"); + error ("UPC layout qualifier is not an integral constant"); else block_factor = fold (layout_qualifier); } @@ -754,13 +755,13 @@ upc_set_block_factor (const enum tree_code decl_kind, if (tree_int_cst_compare (block_factor, integer_zero_node) < 0) { - error ("layout qualifier must be a non-negative integral constant"); + error ("UPC layout qualifier must be a non-negative integral constant"); return type; } if (tree_int_cst_compare (block_factor, UPC_MAX_BLOCK_SIZE_CSTU) > 0) { - error ("Maximum block size in this implementation is %s", + error ("the maximum UPC block size in this implementation is %s", UPC_MAX_BLOCK_SIZE_STRING); return type; } @@ -923,8 +924,8 @@ upc_decl_init (tree decl, tree init) tree cur_stmt_list_save, init_stmt; if (TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE) { - error ("initialization of UPC shared arrays" - " is currently not supported"); + error ("initialization of UPC shared arrays " + "is currently not supported"); return; } if (!upc_init_stmt_list) @@ -1127,7 +1128,7 @@ upc_affinity_test (location_t loc, tree affinity) } else { - error ("Affinity expression is neither an integer nor the address of a shared object"); + error ("UPC affinity expression is neither an integer nor the address of a shared object"); return error_mark_node; } @@ -1255,11 +1256,11 @@ upc_num_threads (void) : lookup_name (get_identifier ("THREADS")); if (!n) { - error ("THREADS is undefined." - " When compiling preprocessd source," - " all -fupc-* switches must be passed on the command line," - " asserting the same values as supplied when the" - " original source file was preprocessed"); + error ("the UPC-required THREADS variable is undefined; " + "when compiling preprocessd source, " + "all -fupc-* switches must be passed on the command line, " + "asserting the same values as supplied when the " + "original source file was preprocessed"); abort (); } @@ -1286,9 +1287,9 @@ upc_diagnose_deprecated_stmt (location_t loc, tree id) { if (!strcmp (name, deprecated_stmts[i].deprecated_id)) { - error_at (loc, "%qs was supported in version 1.0 of the UPC" - " specification, it has been deprecated," - " use %qs instead", name, + error_at (loc, "%qs was supported in version 1.0 of the UPC " + "specification, it has been deprecated, " + "use %qs instead", name, deprecated_stmts[i].correct_id); return 1; } @@ -1426,9 +1427,9 @@ upc_build_shared_var_addr (location_t loc, tree type, tree var) shared_vaddr_base = identifier_global_value ( get_identifier ("UPCRL_shared_begin")); if (!shared_vaddr_base) - fatal_error ("UPC shared section start address not found." - " Cannot find a definition for either" - " __upc_shared_start or UPCRL_shared_begin."); + fatal_error ("UPC shared section start address not found; " + "cannot find a definition for either " + "__upc_shared_start or UPCRL_shared_begin"); assemble_external (shared_vaddr_base); TREE_USED (shared_vaddr_base) = 1; shared_vaddr_base = build1 (ADDR_EXPR, char_ptr_type, shared_vaddr_base); @@ -1485,7 +1486,8 @@ upc_pts_int_sum (location_t loc, if (TREE_CODE (result_targ_type) == VOID_TYPE) - error_at (loc, "pointer of type % used in arithmetic"); + error_at (loc, "UPC does not a pointer of type % " + "to be used in arithmetic"); /* We have a pointer to a shared object. For pointers to simple objects, just build a "resultcode" tree with the intop and @@ -1549,7 +1551,7 @@ upc_pts_diff (tree op0, tree op1) || (upc_shared_type_p (TREE_TYPE (TREE_TYPE (op1))) && !upc_shared_type_p (target_type))) { - error ("Attempt to take the difference of shared and nonshared pointers"); + error ("attempt to take the difference of a UPC pointer-to-shared and a local pointers"); return size_one_node; } result = build2 (MINUS_EXPR, ptrdiff_type_node, op0, op1); diff --git a/gcc/upc/upc-gimplify.c b/gcc/upc/upc-gimplify.c index b6dc0168ee7..69bc3ce38cc 100644 --- a/gcc/upc/upc-gimplify.c +++ b/gcc/upc/upc-gimplify.c @@ -124,7 +124,7 @@ upc_expand_get (location_t loc, tree src_addr, libfunc_name = XSTR (lib_op, 0); libfunc = identifier_global_value (get_identifier (libfunc_name)); if (!libfunc) - internal_error ("runtime function %s not found", libfunc_name); + internal_error ("UPC runtime function %s not found", libfunc_name); if (op_mode == BLKmode) { tree size = size_in_bytes (result_type); @@ -210,7 +210,7 @@ upc_expand_put (location_t loc, tree dest_addr, tree src, gimple_seq *pre_p) } libfunc = identifier_global_value (get_identifier (libfunc_name)); if (!libfunc) - internal_error ("runtime function %s not found", libfunc_name); + internal_error ("UPC runtime function %s not found", libfunc_name); if (op_mode == BLKmode) { tree size = tree_expr_size (src); @@ -231,7 +231,7 @@ upc_expand_put (location_t loc, tree dest_addr, tree src, gimple_seq *pre_p) tree libfunc_arg_types = TYPE_ARG_TYPES (TREE_TYPE (libfunc)); tree put_arg_type = TREE_VALUE (TREE_CHAIN (libfunc_arg_types)); if (TYPE_PRECISION (put_arg_type) != TYPE_PRECISION (src_type)) - internal_error ("%s: argument precision mismatch", libfunc_name); + internal_error ("%s: UPC put operation argument precision mismatch", libfunc_name); /* Avoid warnings about implicit conversion between actual parameter value's type, and the type of the runtime routine's parameter. */ @@ -490,7 +490,8 @@ upc_shared_addr (location_t loc, tree exp) return ref; if (TREE_CODE (ref) == BIT_FIELD_REF) { - error ("Unsupported access to shared bit field"); + error ("accesses to UPC shared bit fields " + "are not yet implemented"); return error_mark_node; } /* Remove the indirection by taking the address and simplifying. */ @@ -561,7 +562,7 @@ upc_gimplify_sync_stmt (location_t loc, } libfunc = identifier_global_value (get_identifier (libfunc_name)); if (!libfunc) - internal_error ("runtime function %s not found", libfunc_name); + internal_error ("UPC runtime function %s not found", libfunc_name); if (!sync_id) sync_id = build_int_cst (NULL_TREE, INT_MIN); lib_args = tree_cons (NULL_TREE, sync_id, NULL_TREE); @@ -691,7 +692,8 @@ upc_gimplify_field_ref (location_t loc, ref = upc_simplify_shared_ref (loc, ref); if (TREE_CODE (ref) == BIT_FIELD_REF) { - error ("Unsupported access to shared bit field"); + error ("accesses to UPC shared bit fields " + "are not yet implemented"); ref = error_mark_node; } *expr_p = ref; diff --git a/gcc/upc/upc-pts-struct.c b/gcc/upc/upc-pts-struct.c index b12bcedcf7a..31d3adda89e 100644 --- a/gcc/upc/upc-pts-struct.c +++ b/gcc/upc/upc-pts-struct.c @@ -362,7 +362,7 @@ upc_pts_build_diff (location_t loc, tree exp) || (upc_shared_type_p (TREE_TYPE (TREE_TYPE (op1))) && !upc_shared_type_p (target_type))) { - error ("Attempt to take the difference of shared and nonshared pointers"); + error ("attempt to take the difference of a UPC pointer-to-shared and a local pointers"); return error_mark_node; } op0 = save_expr (op0); @@ -474,7 +474,7 @@ upc_pts_build_cvt (location_t loc, tree exp) tree libfunc, lib_args, lib_call; libfunc = identifier_global_value (get_identifier (libfunc_name)); if (!libfunc) - internal_error ("library function %s not found", + internal_error ("UPC runtime library function %s not found", libfunc_name); lib_args = tree_cons (NULL_TREE, src, NULL_TREE); if (doprofcall) -- 2.11.4.GIT