Changeset 8f557161 for src/AST

Timestamp:

Jun 13, 2023, 4:33:16 PM (12 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

5668740, fec8bd1

Parents:

576aadb

Message:

Clarify and fix accuracy in eval public API, on reporting "unable to evaluate."

While the eval internals always used the flag pair valid and cfavalid almost correctly, the public interface exposed the outcome as a single flag, and the various interpretations of this flag were a mess.

Old cfacc treated sizeof(whatever) in some contexts as "known to be zero," which is wrong.
The generally correct answer, which new cfacc now uses is, "unknown now, but GCC will see it as a fine constant."
New tests/eval.cfa captures this fact: is runnable and would fail on old cfacc; it passes with new cfacc.

File:

• src/AST/Decl.cpp (modified) (1 diff)

src/AST/Decl.cpp

@@ -142 +142 @@
 bool EnumDecl::valueOf( const Decl * enumerator, long long& value ) const {
         if ( enumValues.empty() ) {
-                long long crntVal = 0;
+                Evaluation crntVal = {0, true, true};  // until expression is given, we know to start counting from 0
                 for ( const Decl * member : members ) {
                         const ObjectDecl* field = strict_dynamic_cast< const ObjectDecl* >( member );
                         if ( field->init ) {
                                 const SingleInit * init = strict_dynamic_cast< const SingleInit* >( field->init.get() );
-                                auto result = eval( init->value );
-                                if ( ! result.second ) {
+                                crntVal = eval( init->value );
+                                if ( ! crntVal.isEvaluableInGCC ) {
                                         SemanticError( init->location, ::toString( "Non-constexpr in initialization of "
                                                 "enumerator: ", field ) );
                                 }
-                                crntVal = result.first;
                         }
                         if ( enumValues.count( field->name ) != 0 ) {
                                 SemanticError( location, ::toString( "Enum ", name, " has multiple members with the "   "name ", field->name ) );
                         }
-                        enumValues[ field->name ] = crntVal;
-                        ++crntVal;
+                        if (crntVal.hasKnownValue) {
+                                enumValues[ field->name ] = crntVal.knownValue;
+                        }
+                        ++crntVal.knownValue;
                 }
         }