Changeset 0a73148 for src/SymTab

Timestamp:

Jul 13, 2018, 6:36:34 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

6da49249

Parents:

6b8b767 (diff), ae144af (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 conflict

File:

• src/SymTab/FixFunction.cc (modified) (2 diffs)

src/SymTab/FixFunction.cc

@@ -30 +30 @@
                 // can't delete function type because it may contain assertions, so transfer ownership to new object
                 ObjectDecl *pointer = new ObjectDecl( functionDecl->name, functionDecl->get_storageClasses(), functionDecl->linkage, nullptr, new PointerType( Type::Qualifiers(), functionDecl->type ), nullptr, functionDecl->attributes );
+                pointer->location = functionDecl->location;
                 functionDecl->attributes.clear();
                 functionDecl->type = nullptr;
@@ -43 +44 @@
                 // need to recursively mutate the base type in order for multi-dimensional arrays to work.
                 PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->isVarLen, arrayType->isStatic );
+                pointerType->location = arrayType->location;
                 arrayType->base = nullptr;
                 arrayType->dimension = nullptr;