6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-06 04:31:08 +00:00
Code Issues Projects Releases Wiki Activity

* Refactor loop in removeAbstractTypeUser to be more clear

Browse Source 
* Fix a bug in DerivedType::refineAbstractTypeTo that caused
  test/Regression/Assembler/2002-04-05-TypeParsing.ll to fail.
  The added comment describes the fix


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2118 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-04-05 19:44:07 +00:00
parent 8db92d0f7b
commit 3f59b7e933
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/VMCore/Type.cpp
View File

@ -782,26 +782,27 @@ void DerivedType::removeAbstractTypeUser(AbstractTypeUser *U) const {
// front. Also, it is likely that there will be a stack like behavior to // front. Also, it is likely that there will be a stack like behavior to
// users that register and unregister users. // users that register and unregister users.
// //
for (unsigned i = AbstractTypeUsers.size(); i > 0; --i) { unsigned i;
if (AbstractTypeUsers[i-1] == U) { for (i = AbstractTypeUsers.size(); AbstractTypeUsers[i-1] != U; --i)
AbstractTypeUsers.erase(AbstractTypeUsers.begin()+i-1); assert(i != 0 && "AbstractTypeUser not in user list!");
--i; // Convert to be in range 0 <= i < size()
assert(i < AbstractTypeUsers.size() && "Index out of range!"); // Wraparound?
AbstractTypeUsers.erase(AbstractTypeUsers.begin()+i);
#ifdef DEBUG_MERGE_TYPES #ifdef DEBUG_MERGE_TYPES
cerr << " removeAbstractTypeUser<" << (void*)this << ", " cerr << " remAbstractTypeUser[" << (void*)this << ", "
<< getDescription() << ">[" << i << "] User = " << U << endl; << getDescription() << "][" << i << "] User = " << U << endl;
#endif #endif
if (AbstractTypeUsers.empty() && isAbstract()) { if (AbstractTypeUsers.empty() && isAbstract()) {
#ifdef DEBUG_MERGE_TYPES #ifdef DEBUG_MERGE_TYPES
cerr << "DELETEing unused abstract type: <" << getDescription() cerr << "DELETEing unused abstract type: <" << getDescription()
<< ">[" << (void*)this << "]" << endl; << ">[" << (void*)this << "]" << endl;
#endif #endif
delete this; // No users of this abstract type! delete this; // No users of this abstract type!
}
return;
}
} }
assert(0 && "AbstractTypeUser not in user list!");
} }
@ -839,9 +840,12 @@ void DerivedType::refineAbstractTypeTo(const Type *NewType) {
unsigned NumSelfUses = 0; unsigned NumSelfUses = 0;
// Iterate over all of the uses of this type, invoking callback. Each user // Iterate over all of the uses of this type, invoking callback. Each user
// should remove itself from our use list automatically. // should remove itself from our use list automatically. We have to check to
// make sure that NewTy doesn't _become_ 'this'. If it does, resolving types
// will not cause users to drop off of the use list. If we resolve to ourself
// we succeed!
// //
while (AbstractTypeUsers.size() > NumSelfUses) { while (AbstractTypeUsers.size() > NumSelfUses && NewTy != this) {
AbstractTypeUser *User = AbstractTypeUsers.back(); AbstractTypeUser *User = AbstractTypeUsers.back();
if (User == this) { if (User == this) {
@ -850,7 +854,8 @@ void DerivedType::refineAbstractTypeTo(const Type *NewType) {
} else { } else {
unsigned OldSize = AbstractTypeUsers.size(); unsigned OldSize = AbstractTypeUsers.size();
#ifdef DEBUG_MERGE_TYPES #ifdef DEBUG_MERGE_TYPES
cerr << " REFINING user " << OldSize-1 << " of abstract type [" cerr << " REFINING user " << OldSize-1 << "[" << (void*)User
<< "] of abstract type ["
<< (void*)this << " " << getDescription() << "] to [" << (void*)this << " " << getDescription() << "] to ["
<< (void*)NewTy.get() << " " << NewTy->getDescription() << "]!\n"; << (void*)NewTy.get() << " " << NewTy->getDescription() << "]!\n";
#endif #endif
@ -859,6 +864,16 @@ void DerivedType::refineAbstractTypeTo(const Type *NewType) {
if (AbstractTypeUsers.size() == OldSize) if (AbstractTypeUsers.size() == OldSize)
User->refineAbstractType(this, NewTy); User->refineAbstractType(this, NewTy);
if (AbstractTypeUsers.size() == OldSize) {
if (AbstractTypeUsers.back() != User)
cerr << "User changed!\n";
cerr << "Top of user list is:\n";
AbstractTypeUsers.back()->dump();
cerr <<"\nOld User=\n";
User->dump();
}
assert(AbstractTypeUsers.size() != OldSize && assert(AbstractTypeUsers.size() != OldSize &&
"AbsTyUser did not remove self from user list!"); "AbsTyUser did not remove self from user list!");
} }
@ -867,7 +882,9 @@ void DerivedType::refineAbstractTypeTo(const Type *NewType) {
// Remove a single self use, even though there may be several here. This will // Remove a single self use, even though there may be several here. This will
// probably 'delete this', so no instance variables may be used after this // probably 'delete this', so no instance variables may be used after this
// occurs... // occurs...
assert(AbstractTypeUsers.back() == this && "Only self uses should be left!"); //
assert((NewTy == this || AbstractTypeUsers.back() == this) &&
"Only self uses should be left!");
removeAbstractTypeUser(this); removeAbstractTypeUser(this);
} }