Changeset 6e1e2d0 for driver/cfa.cc

Timestamp:

May 1, 2023, 4:19:09 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolved merge conflicts

File:

• driver/cfa.cc (modified) (4 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb 14 22:46:38 2023
-// Update Count     : 470
+// Last Modified On : Mon Apr 10 21:16:00 2023
+// Update Count     : 476
 //
 
@@ -44 +44 @@
         static int flags = 0;
 
+    // This allocation 'leaks' memory from the program to the execution
+    // environment, as putenv does not manage the storage of the string used
+    // as an environment variable. This leak is necessary to ensure the
+    // underlying C string is allocated long enough.
         if ( putenv( (char *)( *new string( string( __CFA_FLAGPREFIX__ + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) ) {
                 cerr << argv[0] << " error, cannot set environment variable." << endl;
@@ -198 +202 @@
                                 } // if
                         } else if ( arg == "-CFA" ) {
-                                CFA_flag = true;                                                // strip the -CFA flag
+                                CFA_flag = true;                                                // strip -CFA flag
                                 link = false;
                                 args[nargs++] = "-fsyntax-only";                // stop after stage 2
                         } else if ( arg == "-debug" ) {
-                                debug = true;                                                   // strip the debug flag
+                                debug = true;                                                   // strip debug flag
                         } else if ( arg == "-nodebug" ) {
-                                debug = false;                                                  // strip the nodebug flag
+                                debug = false;                                                  // strip nodebug flag
                         } else if ( arg == "-quiet" ) {
-                                quiet = true;                                                   // strip the quiet flag
+                                quiet = true;                                                   // strip quiet flag
                         } else if ( arg == "-noquiet" ) {
-                                quiet = false;                                                  // strip the noquiet flag
+                                quiet = false;                                                  // strip noquiet flag
+                        } else if ( arg == "-invariant" ) {
+                                Putenv( argv, "-" + arg );
+                        } else if ( arg == "--invariant" ) {
+                                Putenv( argv, arg );
                         } else if ( arg == "-no-include-stdhdr" ) {
-                                noincstd_flag = true;                                   // strip the no-include-stdhdr flag
+                                noincstd_flag = true;                                   // strip no-include-stdhdr flag
                         } else if ( arg == "-nolib" ) {
-                                nolib = true;                                                   // strip the nolib flag
+                                nolib = true;                                                   // strip nolib flag
                         } else if ( arg == "-help" ) {
-                                help = true;                                                    // strip the help flag
+                                help = true;                                                    // strip help flag
                         } else if ( arg == "-nohelp" ) {
-                                help = false;                                                   // strip the nohelp flag
+                                help = false;                                                   // strip nohelp flag
                         } else if ( arg == "-cfalib") {
                                 compiling_libs = true;
@@ -274 +282 @@
                                 } // if
                         } else if ( prefix( arg, "-B" ) ) {
-                                bprefix = arg.substr(2);                                // strip the -B flag
+                                bprefix = arg.substr(2);                                // strip -B flag
                         } else if ( arg == "-c" || arg == "-S" || arg == "-E" || arg == "-M" || arg == "-MM" ) {
                                 args[nargs++] = argv[i];                                // pass flag along