Changeset 5546eee4 for src/InitTweak/FixInit.cpp

Timestamp:

Dec 16, 2023, 1:01:44 AM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

b7898ac

Parents:

0fa0201d (diff), 69ab896 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/InitTweak/FixInit.cpp (modified) (2 diffs)

src/InitTweak/FixInit.cpp

@@ -1057 +1057 @@
         )
         if ( ! diff.empty() ) {
-                SemanticError( stmt, std::string("jump to label '") + stmt->target.name + "' crosses initialization of " + (*diff.begin())->name + " " );
+                SemanticError( stmt->location, "jump to label \"%s\" crosses initialization of \"%s\".",
+                                           stmt->target.name.c_str(), (*diff.begin())->name.c_str() );
         } // if
 }
@@ -1076 +1077 @@
 
 bool checkWarnings( const ast::FunctionDecl * funcDecl ) {
-        // only check for warnings if the current function is a user-defined
-        // constructor or destructor
+        // only check for warnings if the current function is a user-defined constructor or destructor
         if ( ! funcDecl ) return false;
         if ( ! funcDecl->stmts ) return false;