[llvm-commits] [llvm] r71165 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h include/llvm/CodeGen/DwarfWriter.h lib/Analysis/ConstantFolding.cpp lib/Analysis/DebugInfo.cpp lib/CodeGen/AsmPrinter/DwarfWriter.cpp lib/CodeGen/SelectionDAG/FastIS
Daniel Dunbar
daniel at zuster.org
Thu May 7 12:26:06 PDT 2009
This commit does a lot more than just revert 71158, and I'm getting a lot of
asserts in debug info generation now. Can you revert this and re-revert
71158?
- Daniel
On Thu, May 7, 2009 at 10:26 AM, Bill Wendling <isanbard at gmail.com> wrote:
> Author: void
> Date: Thu May 7 12:26:14 2009
> New Revision: 71165
>
> URL: http://llvm.org/viewvc/llvm-project?rev=71165&view=rev
> Log:
> Temporarily revert r71158. It was causing a failure during a full
> bootstrap:
>
> checking for bcopy... no
> checking for getc_unlocked... Assertion failed: (0 && "Unknown SCEV
> kind!"), function operator(), file
> /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/Analysis/ScalarEvolution.cpp,
> line 511.
> /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmgcc42.roots/llvmgcc42~obj/src/libdecnumber/decUtility.c:360:
> internal compiler error: Abort trap
> Please submit a full bug report,
> with preprocessed source if appropriate.
> See <URL:http://developer.apple.com/bugreporter> for instructions.
> make[4]: *** [decUtility.o] Error 1
> make[4]: *** Waiting for unfinished jobs....
> Assertion failed: (0 && "Unknown SCEV kind!"), function operator(), file
> /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/Analysis/ScalarEvolution.cpp,
> line 511.
> /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmgcc42.roots/llvmgcc42~obj/src/libdecnumber/decNumber.c:5591:
> internal compiler error: Abort trap
> Please submit a full bug report,
> with preprocessed source if appropriate.
> See <URL:http://developer.apple.com/bugreporter> for instructions.
> make[4]: *** [decNumber.o] Error 1
> make[3]: *** [all-stage2-libdecnumber] Error 2
> make[3]: *** Waiting for unfinished jobs....
>
>
> Removed:
> llvm/trunk/test/Transforms/InstCombine/constant-fold-ptr-casts.ll
> Modified:
> llvm/trunk/include/llvm/Analysis/DebugInfo.h
> llvm/trunk/include/llvm/CodeGen/DwarfWriter.h
> llvm/trunk/lib/Analysis/ConstantFolding.cpp
> llvm/trunk/lib/Analysis/DebugInfo.cpp
> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
> llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>
> Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=71165&r1=71164&r2=71165&view=diff
>
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original)
> +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Thu May 7 12:26:14 2009
> @@ -321,6 +321,19 @@
> bool describes(const Function *F);
> };
>
> + /// DIInlinedSubprogram - This is a wrapper for an inlined subprogram.
> + class DIInlinedSubprogram : public DIGlobal {
> + public:
> + explicit DIInlinedSubprogram(GlobalVariable *GV = 0);
> + DICompositeType getType() const { return
> getFieldAs<DICompositeType>(8); }
> +
> + /// Verify - Verify that an inlined subprogram descriptor is well
> formed.
> + bool Verify() const;
> +
> + /// dump - print inlined subprogram.
> + void dump() const;
> + };
> +
> /// DIGlobalVariable - This is a wrapper for a global variable.
> class DIGlobalVariable : public DIGlobal {
> public:
> @@ -363,6 +376,7 @@
> public:
> explicit DIBlock(GlobalVariable *GV = 0);
>
> + DICompileUnit getCompileUnit() const{ return
> getFieldAs<DICompileUnit>(1); }
> DIDescriptor getContext() const { return getDescriptorField(1); }
> };
>
>
> Modified: llvm/trunk/include/llvm/CodeGen/DwarfWriter.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/DwarfWriter.h?rev=71165&r1=71164&r2=71165&view=diff
>
>
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/DwarfWriter.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/DwarfWriter.h Thu May 7 12:26:14 2009
> @@ -91,7 +91,7 @@
> unsigned RecordRegionStart(GlobalVariable *V);
>
> /// RecordRegionEnd - Indicate the end of a region.
> - unsigned RecordRegionEnd(GlobalVariable *V);
> + unsigned RecordRegionEnd(GlobalVariable *V, DISubprogram &SP);
>
> /// getRecordSourceLineCount - Count source lines.
> unsigned getRecordSourceLineCount();
>
> Modified: llvm/trunk/lib/Analysis/ConstantFolding.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ConstantFolding.cpp?rev=71165&r1=71164&r2=71165&view=diff
>
>
> ==============================================================================
> --- llvm/trunk/lib/Analysis/ConstantFolding.cpp (original)
> +++ llvm/trunk/lib/Analysis/ConstantFolding.cpp Thu May 7 12:26:14 2009
> @@ -16,7 +16,6 @@
> #include "llvm/Constants.h"
> #include "llvm/DerivedTypes.h"
> #include "llvm/Function.h"
> -#include "llvm/GlobalVariable.h"
> #include "llvm/Instructions.h"
> #include "llvm/Intrinsics.h"
> #include "llvm/ADT/SmallVector.h"
> @@ -384,43 +383,12 @@
> // the int size is >= the ptr size. This requires knowing the width of
> a
> // pointer, so it can't be done in ConstantExpr::getCast.
> if (ConstantExpr *CE = dyn_cast<ConstantExpr>(Ops[0])) {
> - if (TD &&
> + if (TD && CE->getOpcode() == Instruction::PtrToInt &&
> TD->getPointerSizeInBits() <=
> CE->getType()->getPrimitiveSizeInBits()) {
> - if (CE->getOpcode() == Instruction::PtrToInt) {
> - Constant *Input = CE->getOperand(0);
> - Constant *C = FoldBitCast(Input, DestTy, *TD);
> - return C ? C : ConstantExpr::getBitCast(Input, DestTy);
> - }
> - // If there's a constant offset added to the integer value before
> - // it is casted back to a pointer, see if the expression can be
> - // converted into a GEP.
> - if (CE->getOpcode() == Instruction::Add)
> - if (ConstantInt *L = dyn_cast<ConstantInt>(CE->getOperand(0)))
> - if (ConstantExpr *R =
> dyn_cast<ConstantExpr>(CE->getOperand(1)))
> - if (R->getOpcode() == Instruction::PtrToInt)
> - if (GlobalVariable *GV =
> - dyn_cast<GlobalVariable>(R->getOperand(0))) {
> - const PointerType *GVTy =
> cast<PointerType>(GV->getType());
> - if (const ArrayType *AT =
> - dyn_cast<ArrayType>(GVTy->getElementType())) {
> - const Type *ElTy = AT->getElementType();
> - uint64_t PaddedSize = TD->getTypePaddedSize(ElTy);
> - APInt PSA(L->getValue().getBitWidth(), PaddedSize);
> - if (ElTy ==
> cast<PointerType>(DestTy)->getElementType() &&
> - L->getValue().urem(PSA) == 0) {
> - APInt ElemIdx = L->getValue().udiv(PSA);
> - if (ElemIdx.ult(APInt(ElemIdx.getBitWidth(),
> - AT->getNumElements()))) {
> - Constant *Index[] = {
> - Constant::getNullValue(CE->getType()),
> - ConstantInt::get(ElemIdx)
> - };
> - return ConstantExpr::getGetElementPtr(GV,
> &Index[0], 2);
> - }
> - }
> - }
> - }
> + Constant *Input = CE->getOperand(0);
> + Constant *C = FoldBitCast(Input, DestTy, *TD);
> + return C ? C : ConstantExpr::getBitCast(Input, DestTy);
> }
> }
> return ConstantExpr::getCast(Opcode, Ops[0], DestTy);
>
> Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=71165&r1=71164&r2=71165&view=diff
>
>
> ==============================================================================
> --- llvm/trunk/lib/Analysis/DebugInfo.cpp (original)
> +++ llvm/trunk/lib/Analysis/DebugInfo.cpp Thu May 7 12:26:14 2009
> @@ -59,6 +59,9 @@
> case DW_TAG_subprogram:
> assert(DISubprogram(GV).Verify() && "Invalid DebugInfo value");
> break;
> + case DW_TAG_inlined_subroutine:
> + assert(DIInlinedSubprogram(GV).Verify() && "Invalid DebugInfo value");
> + break;
> case DW_TAG_lexical_block:
> /// FIXME. This interfers with the quality of generated code when
> /// during optimization.
> @@ -146,6 +149,8 @@
> : DIType(GV, dwarf::DW_TAG_base_type) {}
> DISubprogram::DISubprogram(GlobalVariable *GV)
> : DIGlobal(GV, dwarf::DW_TAG_subprogram) {}
> +DIInlinedSubprogram::DIInlinedSubprogram(GlobalVariable *GV)
> + : DIGlobal(GV, dwarf::DW_TAG_inlined_subroutine) {}
> DIGlobalVariable::DIGlobalVariable(GlobalVariable *GV)
> : DIGlobal(GV, dwarf::DW_TAG_variable) {}
> DIBlock::DIBlock(GlobalVariable *GV)
> @@ -286,6 +291,25 @@
> return true;
> }
>
> +/// Verify - Verify that an inlined subprogram descriptor is well formed.
> +bool DIInlinedSubprogram::Verify() const {
> + if (isNull())
> + return false;
> +
> + if (getContext().isNull())
> + return false;
> +
> + DICompileUnit CU = getCompileUnit();
> + if (!CU.Verify())
> + return false;
> +
> + DICompositeType Ty = getType();
> + if (!Ty.isNull() && !Ty.Verify())
> + return false;
> +
> + return true;
> +}
> +
> /// Verify - Verify that a global variable descriptor is well formed.
> bool DIGlobalVariable::Verify() const {
> if (isNull())
> @@ -983,7 +1007,8 @@
>
> /// dump - print descriptor.
> void DIDescriptor::dump() const {
> - cerr << " [" << dwarf::TagString(getTag()) << "]\n";
> + cerr << "[" << dwarf::TagString(getTag()) << "] ";
> + cerr << std::hex << "[GV:" << GV << "]" << std::dec;
> }
>
> /// dump - print compile unit.
> @@ -1085,6 +1110,11 @@
> DIGlobal::dump();
> }
>
> +/// dump - print subprogram.
> +void DIInlinedSubprogram::dump() const {
> + DIGlobal::dump();
> +}
> +
> /// dump - print global variable.
> void DIGlobalVariable::dump() const {
> cerr << " ["; getGlobal()->dump(); cerr << "] ";
>
> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=71165&r1=71164&r2=71165&view=diff
>
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Thu May 7 12:26:14
> 2009
> @@ -1094,7 +1094,7 @@
> ///
> class DbgVariable {
> DIVariable Var; // Variable Descriptor.
> - unsigned FrameIndex; // Variable frame index.
> + unsigned FrameIndex; // Variable frame index.
> public:
> DbgVariable(DIVariable V, unsigned I) : Var(V), FrameIndex(I) {}
>
> @@ -1280,14 +1280,32 @@
> /// DbgInlinedScopeMap - Tracks inlined scopes in the current function.
> DenseMap<GlobalVariable *, SmallVector<DbgScope *, 2> >
> DbgInlinedScopeMap;
>
> - /// InlineInfo - Keep track of inlined functions and their location.
> - /// This information is used to populate debug_inlined section.
> + /// InlineInfo - Keep track of inlined functions and their location.
> This
> + /// information is used to populate debug_inlined section.
> DenseMap<GlobalVariable *, SmallVector<unsigned, 4> > InlineInfo;
>
> /// InlinedVariableScopes - Scopes information for the inlined subroutine
> /// variables.
> DenseMap<const MachineInstr *, DbgScope *> InlinedVariableScopes;
>
> + /// AbstractInstanceRootMap - Map of abstract instance roots of inlined
> + /// functions. These are subroutine entries that contain a DW_AT_inline
> + /// attribute.
> + DenseMap<const GlobalVariable *, DbgScope *> AbstractInstanceRootMap;
> +
> + /// AbstractInstanceRootList - List of abstract instance roots of
> inlined
> + /// functions. These are subroutine entries that contain a DW_AT_inline
> + /// attribute.
> + SmallVector<DbgScope *, 32> AbstractInstanceRootList;
> +
> + /// LexicalScopeToConcreteInstMap - Map a concrete instance's DIE to the
> + /// lexical scope it's in.
> + DenseMap<DbgScope *, DIE *> LexicalScopeToConcreteInstMap;
> +
> + /// LexicalScopeStack - A stack of lexical scopes. The top one is the
> current
> + /// scope.
> + SmallVector<DbgScope *, 16> LexicalScopeStack;
> +
> /// DebugTimer - Timer for the Dwarf debug writer.
> Timer *DebugTimer;
>
> @@ -1769,7 +1787,7 @@
> if (Element.getTag() == dwarf::DW_TAG_subprogram)
> ElemDie = CreateSubprogramDIE(DW_Unit,
> DISubprogram(Element.getGV()));
> - else if (Element.getTag() == dwarf::DW_TAG_variable) // ???
> + else if (Element.getTag() == dwarf::DW_TAG_variable) // ??
> ElemDie = CreateGlobalVariableDIE(DW_Unit,
>
> DIGlobalVariable(Element.getGV()));
> else
> @@ -1958,6 +1976,7 @@
>
> if (!SP.isDefinition()) {
> AddUInt(SPDie, DW_AT_declaration, DW_FORM_flag, 1);
> +
> // Add arguments. Do not add arguments for subprogram definition.
> They
> // will be handled through RecordVariable.
> if (SPTag == DW_TAG_subroutine_type)
> @@ -2030,6 +2049,13 @@
> DbgScope *&Slot = DbgScopeMap[V];
> if (Slot) return Slot;
>
> + // Don't create a new scope if we already created one for an inlined
> + // function.
> + DenseMap<const GlobalVariable *, DbgScope *>::iterator
> + II = AbstractInstanceRootMap.find(V);
> + if (II != AbstractInstanceRootMap.end())
> + return LexicalScopeStack.back();
> +
> DbgScope *Parent = NULL;
> DIBlock Block(V);
>
> @@ -2050,31 +2076,19 @@
> return Slot;
> }
>
> - /// createInlinedSubroutineScope - Returns the scope associated with the
> - /// inlined subroutine.
> - ///
> - DbgScope *createInlinedSubroutineScope(DISubprogram SP, unsigned Src,
> - unsigned Line, unsigned Col) {
> - DbgScope *Scope =
> - new DbgInlinedSubroutineScope(NULL, SP, Src, Line, Col);
> -
> - // FIXME - Add inlined function scopes to the root so we can delete
> them
> - // later.
> - assert (FunctionDbgScope && "Function scope info missing!");
> - FunctionDbgScope->AddScope(Scope);
> - return Scope;
> - }
> -
> /// ConstructDbgScope - Construct the components of a scope.
> ///
> void ConstructDbgScope(DbgScope *ParentScope,
> unsigned ParentStartID, unsigned ParentEndID,
> DIE *ParentDie, CompileUnit *Unit) {
> - // Add variables to scope.
> - SmallVector<DbgVariable *, 8> &Variables =
> ParentScope->getVariables();
> - for (unsigned i = 0, N = Variables.size(); i < N; ++i) {
> - DIE *VariableDie = NewDbgScopeVariable(Variables[i], Unit);
> - if (VariableDie) ParentDie->AddChild(VariableDie);
> + if (LexicalScopeToConcreteInstMap.find(ParentScope) ==
> + LexicalScopeToConcreteInstMap.end()) {
> + // Add variables to scope.
> + SmallVector<DbgVariable *, 8> &Variables =
> ParentScope->getVariables();
> + for (unsigned i = 0, N = Variables.size(); i < N; ++i) {
> + DIE *VariableDie = NewDbgScopeVariable(Variables[i], Unit);
> + if (VariableDie) ParentDie->AddChild(VariableDie);
> + }
> }
>
> // Add nested scopes.
> @@ -2099,17 +2113,14 @@
> ConstructDbgScope(Scope, ParentStartID, ParentEndID, ParentDie,
> Unit);
> } else {
> DIE *ScopeDie = NULL;
> - if (MainCU && TAI->doesDwarfUsesInlineInfoSection()
> - && Scope->isInlinedSubroutine()) {
> - ScopeDie = new DIE(DW_TAG_inlined_subroutine);
> - DIE *Origin =
> MainCU->getDieMapSlotFor(Scope->getDesc().getGV());
> - AddDIEntry(ScopeDie, DW_AT_abstract_origin, DW_FORM_ref4,
> Origin);
> - AddUInt(ScopeDie, DW_AT_call_file, 0, Scope->getFile());
> - AddUInt(ScopeDie, DW_AT_call_line, 0, Scope->getLine());
> - AddUInt(ScopeDie, DW_AT_call_column, 0, Scope->getColumn());
> - } else {
> +
> + DenseMap<DbgScope *, DIE *>::iterator I =
> + LexicalScopeToConcreteInstMap.find(Scope);
> +
> + if (I != LexicalScopeToConcreteInstMap.end())
> + ScopeDie = I->second;
> + else
> ScopeDie = new DIE(DW_TAG_lexical_block);
> - }
>
> // Add the scope bounds.
> if (StartID)
> @@ -2165,6 +2176,29 @@
> ConstructDbgScope(RootScope, 0, 0, SPDie, Unit);
> }
>
> + void ConstructAbstractDbgScope(DbgScope *AbsScope) {
> + // Exit if there is no root scope.
> + if (!AbsScope) return;
> +
> + DIDescriptor Desc = AbsScope->getDesc();
> + if (Desc.isNull())
> + return;
> +
> + // Get the subprogram debug information entry.
> + DISubprogram SPD(Desc.getGV());
> +
> + // Get the compile unit context.
> + CompileUnit *Unit = MainCU;
> + if (!Unit)
> + Unit = &FindCompileUnit(SPD.getCompileUnit());
> +
> + // Get the subprogram die.
> + DIE *SPDie = Unit->getDieMapSlotFor(SPD.getGV());
> + assert(SPDie && "Missing subprogram descriptor");
> +
> + ConstructDbgScope(AbsScope, 0, 0, SPDie, Unit);
> + }
> +
> /// ConstructDefaultDbgScope - Construct a default scope for the
> subprogram.
> ///
> void ConstructDefaultDbgScope(MachineFunction *MF) {
> @@ -2891,7 +2925,6 @@
> DISubprogram SP(GV);
> std::string Name;
> std::string LName;
> -
> SP.getLinkageName(LName);
> SP.getName(Name);
>
> @@ -3087,8 +3120,10 @@
>
> // Add to map.
> Slot = SubprogramDie;
> +
> // Add to context owner.
> Unit->getDie()->AddChild(SubprogramDie);
> +
> // Expose as global.
> std::string Name;
> Unit->AddGlobal(SP.getName(Name), SubprogramDie);
> @@ -3136,6 +3171,11 @@
> for (unsigned j = 0, M = Values.size(); j < M; ++j)
> delete Values[j];
>
> + for (DenseMap<const GlobalVariable *, DbgScope *>::iterator
> + I = AbstractInstanceRootMap.begin(),
> + E = AbstractInstanceRootMap.end(); I != E;++I)
> + delete I->second;
> +
> delete DebugTimer;
> }
>
> @@ -3342,6 +3382,12 @@
> // information) needs to be explored.
> ConstructDefaultDbgScope(MF);
>
> + // Construct the DbgScope for abstract instances.
> + for (SmallVector<DbgScope *, 32>::iterator
> + I = AbstractInstanceRootList.begin(),
> + E = AbstractInstanceRootList.end(); I != E; ++I)
> + ConstructAbstractDbgScope(*I);
> +
> DebugFrames.push_back(FunctionDebugFrameInfo(SubprogramCount,
> MMI->getFrameMoves()));
>
> @@ -3352,6 +3398,9 @@
> DbgInlinedScopeMap.clear();
> InlinedVariableScopes.clear();
> FunctionDbgScope = NULL;
> + LexicalScopeStack.clear();
> + AbstractInstanceRootList.clear();
> + LexicalScopeToConcreteInstMap.clear();
> }
>
> Lines.clear();
> @@ -3429,6 +3478,7 @@
> DbgScope *Scope = getOrCreateScope(V);
> unsigned ID = MMI->NextLabelID();
> if (!Scope->getStartLabelID()) Scope->setStartLabelID(ID);
> + LexicalScopeStack.push_back(Scope);
>
> if (TimePassesIsEnabled)
> DebugTimer->stopTimer();
> @@ -3437,13 +3487,14 @@
> }
>
> /// RecordRegionEnd - Indicate the end of a region.
> - unsigned RecordRegionEnd(GlobalVariable *V) {
> + unsigned RecordRegionEnd(GlobalVariable *V, DISubprogram &SP) {
> if (TimePassesIsEnabled)
> DebugTimer->startTimer();
>
> - DbgScope *Scope = getOrCreateScope(V);
> unsigned ID = MMI->NextLabelID();
> + DbgScope *Scope = getOrCreateScope(V);
> Scope->setEndLabelID(ID);
> + LexicalScopeStack.pop_back();
>
> if (TimePassesIsEnabled)
> DebugTimer->stopTimer();
> @@ -3497,28 +3548,59 @@
> if (TimePassesIsEnabled)
> DebugTimer->startTimer();
>
> - std::string Dir, Fn;
> - unsigned Src = GetOrCreateSourceID(CU.getDirectory(Dir),
> - CU.getFilename(Fn));
> - DbgScope *Scope = createInlinedSubroutineScope(SP, Src, Line, Col);
> - Scope->setStartLabelID(LabelID);
> - MMI->RecordUsedDbgLabel(LabelID);
> GlobalVariable *GV = SP.getGV();
> + DenseMap<const GlobalVariable *, DbgScope *>::iterator
> + II = AbstractInstanceRootMap.find(GV);
>
> - DenseMap<GlobalVariable *, SmallVector<DbgScope *, 2> >::iterator
> - SI = DbgInlinedScopeMap.find(GV);
> + if (II == AbstractInstanceRootMap.end()) {
> + // Create an abstract instance entry for this inlined function if it
> + // doesn't already exist.
> + DbgScope *Scope = new DbgScope(NULL, DIDescriptor(GV));
> +
> + // Get the compile unit context.
> + CompileUnit *Unit = &FindCompileUnit(SP.getCompileUnit());
> + DIE *SPDie = Unit->getDieMapSlotFor(GV);
> + assert(SPDie && "Missing subprogram descriptor!");
> +
> + // Mark as being inlined. This makes this subprogram entry an
> abstract
> + // instance root.
> + // FIXME: Our debugger doesn't care about the value of DW_AT_inline,
> only
> + // that it's defined. It probably won't change in the future, but
> this
> + // could be more elegant.
> + AddUInt(SPDie, DW_AT_inline, 0, DW_INL_declared_not_inlined);
> +
> + // Keep track of the scope that's inlined into this function.
> + DenseMap<GlobalVariable *, SmallVector<DbgScope *, 2> >::iterator
> + SI = DbgInlinedScopeMap.find(GV);
>
> - if (SI == DbgInlinedScopeMap.end())
> - DbgInlinedScopeMap[GV].push_back(Scope);
> - else
> - SI->second.push_back(Scope);
> + if (SI == DbgInlinedScopeMap.end())
> + DbgInlinedScopeMap[GV].push_back(Scope);
> + else
> + SI->second.push_back(Scope);
> +
> + // Track the start label for this inlined function.
> + DenseMap<GlobalVariable *, SmallVector<unsigned, 4> >::iterator
> + I = InlineInfo.find(GV);
>
> - DenseMap<GlobalVariable *, SmallVector<unsigned, 4> >::iterator
> - I = InlineInfo.find(GV);
> - if (I == InlineInfo.end())
> - InlineInfo[GV].push_back(LabelID);
> - else
> - I->second.push_back(LabelID);
> + if (I == InlineInfo.end())
> + InlineInfo[GV].push_back(LabelID);
> + else
> + I->second.push_back(LabelID);
> +
> + AbstractInstanceRootMap[GV] = Scope;
> + AbstractInstanceRootList.push_back(Scope);
> + }
> +
> + // Create a concrete inlined instance for this inlined function.
> + DIE *ScopeDie = new DIE(DW_TAG_inlined_subroutine);
> + CompileUnit *Unit = &FindCompileUnit(SP.getCompileUnit());
> + DIE *Origin = Unit->getDieMapSlotFor(GV);
> + AddDIEntry(ScopeDie, DW_AT_abstract_origin, DW_FORM_ref4, Origin);
> + AddUInt(ScopeDie, DW_AT_call_file, 0, Unit->getID());
> + AddUInt(ScopeDie, DW_AT_call_line, 0, Line);
> + AddUInt(ScopeDie, DW_AT_call_column, 0, Col);
> +
> + LexicalScopeToConcreteInstMap[LexicalScopeStack.back()] = ScopeDie;
>
> if (TimePassesIsEnabled)
> DebugTimer->stopTimer();
> @@ -3528,6 +3610,7 @@
>
> /// RecordInlinedFnEnd - Indicate the end of inlined subroutine.
> unsigned RecordInlinedFnEnd(DISubprogram &SP) {
> + // FIXME: This function never seems to be called!!
> if (!TAI->doesDwarfUsesInlineInfoSection())
> return 0;
>
> @@ -4729,8 +4812,8 @@
> }
>
> /// RecordRegionEnd - Indicate the end of a region.
> -unsigned DwarfWriter::RecordRegionEnd(GlobalVariable *V) {
> - return DD->RecordRegionEnd(V);
> +unsigned DwarfWriter::RecordRegionEnd(GlobalVariable *V, DISubprogram &SP)
> {
> + return DD->RecordRegionEnd(V, SP);
> }
>
> /// getRecordSourceLineCount - Count source lines.
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp?rev=71165&r1=71164&r2=71165&view=diff
>
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Thu May 7 12:26:14
> 2009
> @@ -365,7 +365,8 @@
> BuildMI(MBB, DL, II).addImm(ID);
> } else {
> const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL);
> - ID =
> DW->RecordRegionEnd(cast<GlobalVariable>(REI->getContext()));
> + ID = DW->RecordRegionEnd(cast<GlobalVariable>(REI->getContext()),
> + Subprogram);
> BuildMI(MBB, DL, II).addImm(ID);
> }
> }
> @@ -391,6 +392,7 @@
> // FIXME : Why DebugLoc is reset at the beginning of each block ?
> if (PrevLoc.isUnknown())
> return true;
> +
> // Record the source line.
> unsigned Line = Subprogram.getLineNumber();
> setCurDebugLoc(DebugLoc::get(MF.getOrCreateDebugLocID(
> @@ -410,10 +412,10 @@
> unsigned Line = Subprogram.getLineNumber();
> MF.setDefaultDebugLoc(DebugLoc::get(MF.getOrCreateDebugLocID(
> CompileUnit.getGV(), Line,
> 0)));
> - if (DW && DW->ShouldEmitDwarfDebug()) {
> +
> + if (DW && DW->ShouldEmitDwarfDebug())
> // llvm.dbg.func_start also defines beginning of function scope.
> DW->RecordRegionStart(cast<GlobalVariable>(FSI->getSubprogram()));
> - }
> }
>
> return true;
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=71165&r1=71164&r2=71165&view=diff
>
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Thu May 7
> 12:26:14 2009
> @@ -3944,7 +3944,8 @@
> }
>
> unsigned LabelID =
> - DW->RecordRegionEnd(cast<GlobalVariable>(REI.getContext()));
> + DW->RecordRegionEnd(cast<GlobalVariable>(REI.getContext()),
> + Subprogram);
> DAG.setRoot(DAG.getLabel(ISD::DBG_LABEL, getCurDebugLoc(),
> getRoot(), LabelID));
> }
>
> Removed: llvm/trunk/test/Transforms/InstCombine/constant-fold-ptr-casts.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/constant-fold-ptr-casts.ll?rev=71164&view=auto
>
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/InstCombine/constant-fold-ptr-casts.ll
> (original)
> +++ llvm/trunk/test/Transforms/InstCombine/constant-fold-ptr-casts.ll
> (removed)
> @@ -1,18 +0,0 @@
> -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i32
> 2143034560}
> -
> -; Instcombine should be able to completely fold this code.
> -
> -target datalayout =
> "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
> -target triple = "i686-apple-darwin8"
> -
> - at bar = constant [3 x i64] [i64 9220983451228067448, i64
> 9220983451228067449, i64 9220983450959631991], align 8
> -
> -define i32 @foo() nounwind {
> -entry:
> - %tmp87.2 = load i64* inttoptr (i32 add (i32 16, i32 ptrtoint ([3 x
> i64]* @bar to i32)) to i64*), align 8
> - %t0 = bitcast i64 %tmp87.2 to double
> - %tmp9192.2 = fptrunc double %t0 to float
> - %t1 = bitcast float %tmp9192.2 to i32
> - ret i32 %t1
> -}
> -
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20090507/0545592f/attachment.html>
More information about the llvm-commits
mailing list