From 3b07386724f837336036b2058e90b1c315fcfdeb Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 9 Feb 2004 03:19:29 +0000 Subject: [PATCH] Instead of searching the entire type graph for a type to determine if it contains the type we are looking for, just search the immediately used types. We can only do this because we keep the "current" type in the nesting level as we decrement upreferences. This change speeds up the testcase in PR224 from 50.4s to 22.08s, not too shabby. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11221 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AsmParser/llvmAsmParser.y | 37 +++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index f0f027ec248..d7efe6bd0fb 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -586,14 +586,33 @@ static bool setValueName(Value *V, char *NameStr) { // Code for handling upreferences in type names... // -// TypeContains - Returns true if Ty contains E in it. +// TypeContains - Returns true if Ty directly contains E in it. // static bool TypeContains(const Type *Ty, const Type *E) { - return find(df_begin(Ty), df_end(Ty), E) != df_end(Ty); + return find(Ty->subtype_begin(), Ty->subtype_end(), E) != Ty->subtype_end(); +} + +namespace { + struct UpRefRecord { + // NestingLevel - The number of nesting levels that need to be popped before + // this type is resolved. + unsigned NestingLevel; + + // LastContainedTy - This is the type at the current binding level for the + // type. Every time we reduce the nesting level, this gets updated. + const Type *LastContainedTy; + + // UpRefTy - This is the actual opaque type that the upreference is + // represented with. + OpaqueType *UpRefTy; + + UpRefRecord(unsigned NL, OpaqueType *URTy) + : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {} + }; } // UpRefs - A list of the outstanding upreferences that need to be resolved. -static std::vector > UpRefs; +static std::vector UpRefs; /// HandleUpRefs - Every time we finish a new layer of types, this function is /// called. It loops through the UpRefs vector, which is a list of the @@ -612,14 +631,16 @@ static PATypeHolder HandleUpRefs(const Type *ty) { UR_OUT(" UR#" << i << " - TypeContains(" << Ty->getDescription() << ", " << UpRefs[i].second->getDescription() << ") = " << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n"); - if (TypeContains(Ty, UpRefs[i].second)) { - unsigned Level = --UpRefs[i].first; // Decrement level of upreference + if (TypeContains(Ty, UpRefs[i].LastContainedTy)) { + // Decrement level of upreference + unsigned Level = --UpRefs[i].NestingLevel; + UpRefs[i].LastContainedTy = Ty; UR_OUT(" Uplevel Ref Level = " << Level << "\n"); if (Level == 0) { // Upreference should be resolved! UR_OUT(" * Resolving upreference for " << UpRefs[i].second->getDescription() << "\n"; - std::string OldName = UpRefs[i].second->getDescription()); - UpRefs[i].second->refineAbstractTypeTo(Ty); + std::string OldName = UpRefs[i].UpRefTy->getDescription()); + UpRefs[i].UpRefTy->refineAbstractTypeTo(Ty); UR_OUT(" * Type '" << OldName << "' refined upreference to: " << (const void*)Ty << ", " << Ty->getDescription() << "\n"); UpRefs.erase(UpRefs.begin()+i); // Remove from upreference list... @@ -924,7 +945,7 @@ UpRTypes : SymbolicValueRef { // Named types are also simple types... UpRTypes : '\\' EUINT64VAL { // Type UpReference if ($2 > (uint64_t)~0U) ThrowException("Value out of range!"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder - UpRefs.push_back(std::make_pair((unsigned)$2, OT)); // Add to vector... + UpRefs.push_back(UpRefRecord((unsigned)$2, OT)); // Add to vector... $$ = new PATypeHolder(OT); UR_OUT("New Upreference!\n"); } -- 2.34.1