Changeset 23a08aa0 for src/CodeGen


Ignore:
Timestamp:
Sep 19, 2022, 8:11:02 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master, pthread-emulation
Children:
aa9f215
Parents:
ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/CodeGen/CodeGenerator.cc

    rebf8ca5 r23a08aa0  
    493493                                        assert( false );
    494494                                } // switch
     495                        } else if( varExpr->get_var()->get_linkage() == LinkageSpec::BuiltinCFA && varExpr->get_var()->get_name() == "intptr" ) {
     496                                // THIS is a hack to make it a constant until a proper constexpr solution is created
     497                                output << "((void*)";
     498                                std::list< Expression* >::iterator arg = applicationExpr->get_args().begin();
     499                                (*arg++)->accept( *visitor );
     500                                output << ")";
    495501                        } else {
    496502                                varExpr->accept( *visitor );
Note: See TracChangeset for help on using the changeset viewer.