Changeset f1917fb
- Timestamp:
- Feb 16, 2018, 3:33:56 PM (7 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- 62cd621
- Parents:
- c2ca04d (diff), 710deb02 (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. - Location:
- src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Parser/TypeData.cc
rc2ca04d rf1917fb 31 31 using namespace std; 32 32 33 TypeData::TypeData( Kind k ) : kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ {33 TypeData::TypeData( Kind k ) : location( yylloc ), kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ { 34 34 switch ( kind ) { 35 35 case Unknown: … … 800 800 assert( td->base ); 801 801 if ( td->symbolic.isTypedef ) { 802 ret = new TypedefDecl( name, scs, typebuild( td->base ), linkage );802 ret = new TypedefDecl( name, td->location, scs, typebuild( td->base ), linkage ); 803 803 } else { 804 804 ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Dtype, true ); -
src/Parser/TypeData.h
rc2ca04d rf1917fb 76 76 }; 77 77 78 CodeLocation location; 79 78 80 Kind kind; 79 81 TypeData * base; -
src/SymTab/Validate.cc
rc2ca04d rf1917fb 857 857 type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ); 858 858 } // if 859 TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), Type::StorageClasses(), type, aggDecl->get_linkage() ) );859 TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() ) ); 860 860 typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel ); 861 861 } // if -
src/SynTree/Declaration.h
rc2ca04d rf1917fb 245 245 typedef NamedTypeDecl Parent; 246 246 public: 247 TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) : Parent( name, scs, type ) { set_linkage( spec ); } 247 TypedefDecl( const std::string &name, CodeLocation location, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) 248 : Parent( name, scs, type ) { set_linkage( spec ); this->location = location; } 249 248 250 TypedefDecl( const TypedefDecl &other ) : Parent( other ) {} 249 251 -
src/main.cc
rc2ca04d rf1917fb 282 282 } // if 283 283 284 CodeTools::fillLocations( translationUnit ); 285 284 286 OPTPRINT( "resolve" ) 285 287 ResolvExpr::resolve( translationUnit ); -
src/tests/raii/.expect/dtor-early-exit-ERR2.txt
rc2ca04d rf1917fb 1 raii/dtor-early-exit.c:2 20:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)1 raii/dtor-early-exit.c:217:1 error: jump to label 'L2' crosses initialization of y Branch (Goto) 2 2 with target: L2 3 3 with original target: L2
Note: See TracChangeset
for help on using the changeset viewer.