Changeset bdd516a for driver/cc1.cc

Timestamp:

Apr 28, 2015, 4:21:36 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

42e2ad7

Parents:

ad17ba6a

Message:

fixed sizeof type variable, find lowest cost alternative for sizeof expression, removed unused classes, added compiler flag, remove temporary file for -CFA, formatting

File:

• driver/cc1.cc (modified) (12 diffs)

driver/cc1.cc

@@ -8 +8 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jan 10 14:16:06 2015
-// Update Count     : 15
+// Last Modified On : Mon Apr 27 23:11:52 2015
+// Update Count     : 39
 //
 
@@ -34 +34 @@
 string D__CFA_FLAGPREFIX__( "-D__CFA_FLAG__=" );
 
+char tmpname[] = P_tmpdir "/CFAXXXXXX";
+int tmpfilefd = -1;
+
 
 bool prefix( string arg, string pre ) {
@@ -69 +72 @@
     } // if
 } // checkEnv
+
+
+void rmtmpfile() {
+    if ( unlink( tmpname ) == -1 ) {                    // remove tmpname
+        perror ( "CFA Translator error: cpp failed" );
+        exit( EXIT_FAILURE );
+    } // if
+    tmpfilefd = -1;                                     // mark closed
+} // rmtmpfile
+
+
+void sigTermHandler( int signal ) {
+    if ( tmpfilefd != -1 ) {                            // RACE, file created ?
+        rmtmpfile();                                    // remove
+        exit( EXIT_FAILURE );                           // terminate 
+    } // if
+} // sigTermHandler
 
 
@@ -89 +109 @@
     const char *uargs[20];                              // leave space for 20 additional cfa-cpp command line values
     int nuargs = 1;                                     // 0 => command name
+
+    signal( SIGINT,  sigTermHandler );
+    signal( SIGTERM, sigTermHandler );
 
     // process all the arguments
@@ -116 +139 @@
                 i += 1;                                 // and the argument
 
-            // strip cfa flags controlling cpp step
-
+            // strip flags controlling cpp step
+
+            } else if ( arg == "-D__CPP__" ) {
+                cpp_flag = true;
+            } else if ( arg == "-D" && string( argv[i + 1] ) == "__CPP__" ) {
+                i += 1;                                 // and the argument
+                cpp_flag = true;
             } else if ( arg == "-D__CFA__" ) {
                 CFA_flag = true;
@@ -123 +151 @@
                 i += 1;                                 // and the argument
                 CFA_flag = true;
-            } else if ( arg == "-D__CPP__" ) {
-                cpp_flag = true;
-            } else if ( arg == "-D" && string( argv[i + 1] ) == "__CPP__" ) {
-                i += 1;                                 // and the argument
-                cpp_flag = true;
             } else if ( prefix( arg, D__CFA_FLAGPREFIX__ ) ) {
                 uargs[nuargs] = ( *new string( arg.substr( D__CFA_FLAGPREFIX__.size() ) ) ).c_str();
@@ -233 +256 @@
     // Create a temporary file to store output of the C preprocessor.
 
-    char tmpname[] = P_tmpdir "/CFAXXXXXX";
-    int tmpfile = mkstemp( tmpname );
-    if ( tmpfile == -1 ) {
+    tmpfilefd = mkstemp( tmpname );
+    if ( tmpfilefd == -1 ) {
         perror( "CFA Translator error: cpp level, mkstemp" );
         exit( EXIT_FAILURE );
@@ -241 +263 @@
 
 #ifdef __DEBUG_H__
-    cerr << "tmpname:" << tmpname << " tmpfile:" << tmpfile << endl;
+    cerr << "tmpname:" << tmpname << " tmpfilefd:" << tmpfilefd << endl;
 #endif // __DEBUG_H__
 
@@ -280 +302 @@
 
     if ( WIFSIGNALED(code) != 0 ) {                     // child failed ?
-        unlink( tmpname );                              // remove tmpname
+        rmtmpfile();                                    // remove tmpname
         cerr << "CFA Translator error: cpp failed with signal " << WTERMSIG(code) << endl;
         exit( EXIT_FAILURE );
@@ -286 +308 @@
 
     if ( WEXITSTATUS(code) != 0 ) {                     // child error ?
-        unlink( tmpname );                              // remove tmpname
+        rmtmpfile();                                    // remove tmpname
         exit( WEXITSTATUS( code ) );                    // do not continue
     } // if
@@ -293 +315 @@
     // output.  Otherwise, run the cfa-cpp preprocessor on the temporary file and save the result into the output file.
 
-    if ( CFA_flag || fork() == 0 ) {                    // conditional fork ?
+    if ( fork() == 0 ) {                                // child runs CFA
         uargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
 
@@ -330 +352 @@
 
     // Must unlink here because file must exist across execvp.
-    if ( unlink( tmpname ) == -1 ) {
-        perror( "CFA Translator error: cpp level, unlink" );
-        exit( EXIT_FAILURE );
-    } // if
+    rmtmpfile();                                        // remove tmpname
 
     if ( WIFSIGNALED(code) ) {                          // child failed ?