From 1c3673b238c8b016ee1137e39a44e06807e8ec44 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 19 Nov 2003 06:01:12 +0000 Subject: [PATCH] Minor speedup to do less linear time searches of information we already have. speeds up disassembly of kc++ by .6s git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10079 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Bytecode/Reader/ConstantReader.cpp | 12 +++++------- lib/Bytecode/Reader/Reader.cpp | 5 +++-- lib/Bytecode/Reader/ReaderInternals.h | 5 ++++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/Bytecode/Reader/ConstantReader.cpp b/lib/Bytecode/Reader/ConstantReader.cpp index b4553548e8e..efc3f01c1e4 100644 --- a/lib/Bytecode/Reader/ConstantReader.cpp +++ b/lib/Bytecode/Reader/ConstantReader.cpp @@ -168,13 +168,11 @@ Constant *BytecodeParser::parseConstantValue(const unsigned char *&Buf, unsigned ArgValSlot, ArgTypeSlot; if (read_vbr(Buf, EndBuf, ArgValSlot)) throw Error_readvbr; if (read_vbr(Buf, EndBuf, ArgTypeSlot)) throw Error_readvbr; - const Type *ArgTy = getType(ArgTypeSlot); - - BCR_TRACE(4, "CE Arg " << i << ": Type: '" << *ArgTy << "' slot: " - << ArgValSlot << "\n"); + BCR_TRACE(4, "CE Arg " << i << ": Type: '" << *getType(ArgTypeSlot) + << "' slot: " << ArgValSlot << "\n"); // Get the arg value from its slot if it exists, otherwise a placeholder - ArgVec.push_back(getConstantValue(ArgTy, ArgValSlot)); + ArgVec.push_back(getConstantValue(ArgTypeSlot, ArgValSlot)); } // Construct a ConstantExpr of the appropriate kind @@ -245,12 +243,12 @@ Constant *BytecodeParser::parseConstantValue(const unsigned char *&Buf, case Type::ArrayTyID: { const ArrayType *AT = cast(Ty); unsigned NumElements = AT->getNumElements(); - + unsigned TypeSlot = getTypeSlot(AT->getElementType()); std::vector Elements; while (NumElements--) { // Read all of the elements of the constant. unsigned Slot; if (read_vbr(Buf, EndBuf, Slot)) throw Error_readvbr; - Elements.push_back(getConstantValue(AT->getElementType(), Slot)); + Elements.push_back(getConstantValue(TypeSlot, Slot)); } return ConstantArray::get(AT, Elements); } diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp index 9acb93d48a6..4c2ec041418 100644 --- a/lib/Bytecode/Reader/Reader.cpp +++ b/lib/Bytecode/Reader/Reader.cpp @@ -172,13 +172,14 @@ BasicBlock *BytecodeParser::getBasicBlock(unsigned ID) { /// constant hasn't been parsed yet, a placeholder is defined and used. Later, /// after the real value is parsed, the placeholder is eliminated. /// -Constant *BytecodeParser::getConstantValue(const Type *Ty, unsigned Slot) { - if (Value *V = getValue(Ty, Slot, false)) +Constant *BytecodeParser::getConstantValue(unsigned TypeSlot, unsigned Slot) { + if (Value *V = getValue(TypeSlot, Slot, false)) if (Constant *C = dyn_cast(V)) return C; // If we already have the value parsed, just return it else throw std::string("Reference of a value is expected to be a constant!"); + const Type *Ty = getType(TypeSlot); std::pair Key(Ty, Slot); GlobalRefsType::iterator I = GlobalRefs.lower_bound(Key); diff --git a/lib/Bytecode/Reader/ReaderInternals.h b/lib/Bytecode/Reader/ReaderInternals.h index 53f699e6d08..8522aee4c29 100644 --- a/lib/Bytecode/Reader/ReaderInternals.h +++ b/lib/Bytecode/Reader/ReaderInternals.h @@ -180,7 +180,10 @@ private: Value *getValue(unsigned TypeID, unsigned num, bool Create = true); const Type *getType(unsigned ID); BasicBlock *getBasicBlock(unsigned ID); - Constant *getConstantValue(const Type *Ty, unsigned num); + Constant *getConstantValue(unsigned TypeID, unsigned num); + Constant *getConstantValue(const Type *Ty, unsigned num) { + return getConstantValue(getTypeSlot(Ty), num); + } unsigned insertValue(Value *V, ValueTable &Table); unsigned insertValue(Value *V, unsigned Type, ValueTable &Table); -- 2.34.1