[RFA][PATCH] Minor erroneous path isolation followups

Jeff Law law@redhat.com
Thu Nov 7 05:32:00 GMT 2013


On 11/06/13 00:12, Jakub Jelinek wrote:
> On Tue, Nov 05, 2013 at 11:15:30PM -0700, Jeff Law wrote:
>> 	* java/builtins.c (initialize_builtins): Provide __builtin_trap.
>
> Without java/ ;)
Yes.  I was aware of that.  I probably should have done
java/

	* builtins.c ...


>
>> --- a/gcc/java/builtins.c
>> +++ b/gcc/java/builtins.c
>> @@ -580,6 +580,9 @@ initialize_builtins (void)
>>   		  build_function_type_list (ptr_type_node, int_type_node, NULL_TREE),
>>   		  "__builtin_return_address", ECF_NOTHROW | ECF_LEAF);
>>
>> +  define_builtin (BUILT_IN_TRAP, "__builtin_trap",
>> +		  build_function_type_list (void_type_node, NULL_TREE),
>> +		  "__builtin_trap", ECF_NOTHROW | ECF_LEAF);
>
> Missing ECF_NORETURN in there, which I'd say is quite essential for
> __builtin_trap.
Agreed.

Bootstrapped & regression tested on x86_64-unknown-linux-gnu.  Ok for 
the trunk now? :-)




-------------- next part --------------
    * doc/invoke.texi (-fisolate-erroneous-paths): Document.

    * gimple-ssa-isolate-paths.c (gate_isolate_erroneous_paths):
    No longer check if we have __builtin_trap, assume it's
    available.

java/

    * builtins.c (initialize_builtins): Provide __builtin_trap.

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 0063445..d4d6fef 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -377,6 +377,7 @@ Objective-C and Objective-C++ Dialects}.
 -fira-region=@var{region} -fira-hoist-pressure @gol
 -fira-loop-pressure -fno-ira-share-save-slots @gol
 -fno-ira-share-spill-slots -fira-verbose=@var{n} @gol
+-fisolate-erroneous-paths
 -fivopts -fkeep-inline-functions -fkeep-static-consts -flive-range-shrinkage @gol
 -floop-block -floop-interchange -floop-strip-mine -floop-nest-optimize @gol
 -floop-parallelize-all -flto -flto-compression-level @gol
@@ -6742,6 +6743,7 @@ also turns on the following optimization flags:
 -finline-small-functions @gol
 -findirect-inlining @gol
 -fipa-sra @gol
+-fisolate-erroneous-paths @gol
 -foptimize-sibling-calls @gol
 -fpartial-inlining @gol
 -fpeephole2 @gol
@@ -7635,6 +7637,11 @@ it may significantly increase code size
 (see @option{--param ipcp-unit-growth=@var{value}}).
 This flag is enabled by default at @option{-O3}.
 
+@item -fisolate-erroneous-paths
+Detect paths which trigger erroneous or undefined behaviour.  Isolate those
+paths from the main control flow and turn the statement with erroneous or
+undefined behaviour into a trap.
+
 @item -ftree-sink
 @opindex ftree-sink
 Perform forward store motion  on trees.  This flag is
diff --git a/gcc/gimple-ssa-isolate-paths.c b/gcc/gimple-ssa-isolate-paths.c
index 4868867..983ed4d 100644
--- a/gcc/gimple-ssa-isolate-paths.c
+++ b/gcc/gimple-ssa-isolate-paths.c
@@ -283,8 +283,7 @@ gate_isolate_erroneous_paths (void)
 {
   /* If we do not have a suitable builtin function for the trap statement,
      then do not perform the optimization.  */
-  return (flag_isolate_erroneous_paths != 0
-	  && builtin_decl_explicit (BUILT_IN_TRAP) != NULL);
+  return (flag_isolate_erroneous_paths != 0);
 }
 
 namespace {
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index f971a6f..c055437 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -579,7 +579,9 @@ initialize_builtins (void)
   define_builtin (BUILT_IN_RETURN_ADDRESS, "__builtin_return_address",
 		  build_function_type_list (ptr_type_node, int_type_node, NULL_TREE),
 		  "__builtin_return_address", ECF_NOTHROW | ECF_LEAF);
-
+  define_builtin (BUILT_IN_TRAP, "__builtin_trap",
+		  build_function_type_list (void_type_node, NULL_TREE),
+		  "__builtin_trap", ECF_NOTHROW | ECF_LEAF | ECF_NORETURN);
   build_common_builtin_nodes ();
 }
 


More information about the Gcc-patches mailing list